diff --git a/acceptance/bundle/invariant/test.toml b/acceptance/bundle/invariant/test.toml index 9c9505e41c8..99aba66a815 100644 --- a/acceptance/bundle/invariant/test.toml +++ b/acceptance/bundle/invariant/test.toml @@ -120,9 +120,6 @@ EnvMatrixExclude.no_model_service_on_cloud = ["CONFIG_Cloud=true", "INPUT_CONFIG # Cloud coverage for data quality monitors comes from # resources/data_quality_monitors/lifecycle; the invariant matrix runs locally. EnvMatrixExclude.no_data_quality_monitor_on_cloud = ["CONFIG_Cloud=true", "INPUT_CONFIG=data_quality_monitor.yml.tmpl"] -# Deployment history has no "features." resource-key prefix, so the deploy fails before the feature -# is created; see dmsResourceTypes in libs/testserver/bundledeployments.go. -EnvMatrixExclude.no_feature_dms = ["DMS=true", "INPUT_CONFIG=feature.yml.tmpl"] # Fake SQL endpoint for local tests [[Server]] diff --git a/acceptance/bundle/resources/features/basic/out.test.toml b/acceptance/bundle/resources/features/basic/out.test.toml index 19b5b15d11f..a927a5fbc06 100644 --- a/acceptance/bundle/resources/features/basic/out.test.toml +++ b/acceptance/bundle/resources/features/basic/out.test.toml @@ -1,2 +1,2 @@ Cloud = false -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/features/lifecycle/out.test.toml b/acceptance/bundle/resources/features/lifecycle/out.test.toml index f68b4a89c36..0f167effef1 100644 --- a/acceptance/bundle/resources/features/lifecycle/out.test.toml +++ b/acceptance/bundle/resources/features/lifecycle/out.test.toml @@ -1,2 +1,2 @@ Cloud = true -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/features/remote-delete/out.test.toml b/acceptance/bundle/resources/features/remote-delete/out.test.toml index 19b5b15d11f..a927a5fbc06 100644 --- a/acceptance/bundle/resources/features/remote-delete/out.test.toml +++ b/acceptance/bundle/resources/features/remote-delete/out.test.toml @@ -1,2 +1,2 @@ Cloud = false -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/features/test.toml b/acceptance/bundle/resources/features/test.toml deleted file mode 100644 index 3713c736975..00000000000 --- a/acceptance/bundle/resources/features/test.toml +++ /dev/null @@ -1,3 +0,0 @@ -# Deployment history has no "features." resource-key prefix, so the deploy fails before the feature -# is created. See dmsResourceTypes in libs/testserver/bundledeployments.go, which mirrors Universe. -EnvMatrixExclude.no_feature_dms = ["DMS=true"] diff --git a/acceptance/bundle/resources/materialization_sets/basic/out.test.toml b/acceptance/bundle/resources/materialization_sets/basic/out.test.toml index 19b5b15d11f..a927a5fbc06 100644 --- a/acceptance/bundle/resources/materialization_sets/basic/out.test.toml +++ b/acceptance/bundle/resources/materialization_sets/basic/out.test.toml @@ -1,2 +1,2 @@ Cloud = false -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/materialization_sets/batch/out.test.toml b/acceptance/bundle/resources/materialization_sets/batch/out.test.toml index f68b4a89c36..0f167effef1 100644 --- a/acceptance/bundle/resources/materialization_sets/batch/out.test.toml +++ b/acceptance/bundle/resources/materialization_sets/batch/out.test.toml @@ -1,2 +1,2 @@ Cloud = true -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/materialization_sets/destination/out.test.toml b/acceptance/bundle/resources/materialization_sets/destination/out.test.toml index 19b5b15d11f..a927a5fbc06 100644 --- a/acceptance/bundle/resources/materialization_sets/destination/out.test.toml +++ b/acceptance/bundle/resources/materialization_sets/destination/out.test.toml @@ -1,2 +1,2 @@ Cloud = false -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/materialization_sets/immutable/out.test.toml b/acceptance/bundle/resources/materialization_sets/immutable/out.test.toml index f68b4a89c36..0f167effef1 100644 --- a/acceptance/bundle/resources/materialization_sets/immutable/out.test.toml +++ b/acceptance/bundle/resources/materialization_sets/immutable/out.test.toml @@ -1,2 +1,2 @@ Cloud = true -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/materialization_sets/immutable/test.toml b/acceptance/bundle/resources/materialization_sets/immutable/test.toml index 9f9dbff911d..3ca9d9f5485 100644 --- a/acceptance/bundle/resources/materialization_sets/immutable/test.toml +++ b/acceptance/bundle/resources/materialization_sets/immutable/test.toml @@ -1,10 +1,6 @@ # Creates its own schema and deletes it on exit. Override MATSET_CATALOG where `main` is absent. Cloud = true -# Both legs run locally. A cloud run must select the DMS= leg: the bundle deployments API -# rejects features. and materialization_sets. as resource-type prefixes. -EnvMatrix.DMS = ["", "true"] - Ignore = [ ".databricks", "databricks.yml", diff --git a/acceptance/bundle/resources/materialization_sets/invalid_members/out.test.toml b/acceptance/bundle/resources/materialization_sets/invalid_members/out.test.toml index 19b5b15d11f..a927a5fbc06 100644 --- a/acceptance/bundle/resources/materialization_sets/invalid_members/out.test.toml +++ b/acceptance/bundle/resources/materialization_sets/invalid_members/out.test.toml @@ -1,2 +1,2 @@ Cloud = false -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/materialization_sets/membership/out.test.toml b/acceptance/bundle/resources/materialization_sets/membership/out.test.toml index 19b5b15d11f..a927a5fbc06 100644 --- a/acceptance/bundle/resources/materialization_sets/membership/out.test.toml +++ b/acceptance/bundle/resources/materialization_sets/membership/out.test.toml @@ -1,2 +1,2 @@ Cloud = false -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/materialization_sets/membership/test.toml b/acceptance/bundle/resources/materialization_sets/membership/test.toml index c6bdf296912..ce3d6d1a504 100644 --- a/acceptance/bundle/resources/materialization_sets/membership/test.toml +++ b/acceptance/bundle/resources/materialization_sets/membership/test.toml @@ -3,10 +3,6 @@ # its own schema and deletes it on exit. Cloud = false -# Both legs run locally. A cloud run must select the DMS= leg: the bundle deployments API -# rejects features. and materialization_sets. as resource-type prefixes. -EnvMatrix.DMS = ["", "true"] - Ignore = [ ".databricks", "databricks.yml", diff --git a/acceptance/bundle/resources/materialization_sets/mixed_triggers/out.test.toml b/acceptance/bundle/resources/materialization_sets/mixed_triggers/out.test.toml index 19b5b15d11f..a927a5fbc06 100644 --- a/acceptance/bundle/resources/materialization_sets/mixed_triggers/out.test.toml +++ b/acceptance/bundle/resources/materialization_sets/mixed_triggers/out.test.toml @@ -1,2 +1,2 @@ Cloud = false -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/materialization_sets/removal_scope/out.test.toml b/acceptance/bundle/resources/materialization_sets/removal_scope/out.test.toml index f68b4a89c36..0f167effef1 100644 --- a/acceptance/bundle/resources/materialization_sets/removal_scope/out.test.toml +++ b/acceptance/bundle/resources/materialization_sets/removal_scope/out.test.toml @@ -1,2 +1,2 @@ Cloud = true -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/materialization_sets/removal_scope/test.toml b/acceptance/bundle/resources/materialization_sets/removal_scope/test.toml index 9f9dbff911d..3ca9d9f5485 100644 --- a/acceptance/bundle/resources/materialization_sets/removal_scope/test.toml +++ b/acceptance/bundle/resources/materialization_sets/removal_scope/test.toml @@ -1,10 +1,6 @@ # Creates its own schema and deletes it on exit. Override MATSET_CATALOG where `main` is absent. Cloud = true -# Both legs run locally. A cloud run must select the DMS= leg: the bundle deployments API -# rejects features. and materialization_sets. as resource-type prefixes. -EnvMatrix.DMS = ["", "true"] - Ignore = [ ".databricks", "databricks.yml", diff --git a/acceptance/bundle/resources/materialization_sets/sawtooth/out.test.toml b/acceptance/bundle/resources/materialization_sets/sawtooth/out.test.toml index 19b5b15d11f..a927a5fbc06 100644 --- a/acceptance/bundle/resources/materialization_sets/sawtooth/out.test.toml +++ b/acceptance/bundle/resources/materialization_sets/sawtooth/out.test.toml @@ -1,2 +1,2 @@ Cloud = false -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/materialization_sets/streaming/out.test.toml b/acceptance/bundle/resources/materialization_sets/streaming/out.test.toml index 19b5b15d11f..a927a5fbc06 100644 --- a/acceptance/bundle/resources/materialization_sets/streaming/out.test.toml +++ b/acceptance/bundle/resources/materialization_sets/streaming/out.test.toml @@ -1,2 +1,2 @@ Cloud = false -EnvMatrix.DMS = [""] +EnvMatrix.DMS = ["", "true"] diff --git a/acceptance/bundle/resources/materialization_sets/test.toml b/acceptance/bundle/resources/materialization_sets/test.toml index 8f6a00a8595..ebbdccfb600 100644 --- a/acceptance/bundle/resources/materialization_sets/test.toml +++ b/acceptance/bundle/resources/materialization_sets/test.toml @@ -5,8 +5,3 @@ Ignore = [ "databricks.yml", ".databricks", ] - -# Deployment history has no "materialization_sets." or "features." resource-key prefix, so the -# deploy fails before anything is created. See dmsResourceTypes in -# libs/testserver/bundledeployments.go, which mirrors the service's allowlist. -EnvMatrixExclude.no_matset_dms = ["DMS=true"] diff --git a/libs/testserver/bundledeployments.go b/libs/testserver/bundledeployments.go index 0eec1a4e463..9b524b4a016 100644 --- a/libs/testserver/bundledeployments.go +++ b/libs/testserver/bundledeployments.go @@ -50,12 +50,14 @@ var dmsResourceTypes = []string{ "database_instances", "experiments", "external_locations", + "features", "genie_spaces", "instance_pools", "internal_immutable_folders", "internal_immutable_snapshots", "job_runs", "jobs", + "materialization_sets", "mcp_services", "model_provider_services", "model_services",