Merge remote-tracking branch 'origin/main' into default-catalog-schema

Author: pietern

.codegen/_openapi_sha

@@ -1 +1 @@
-8b2cd47cbac64b32e120601110a5fc70b8189ba4
+e1ea3f5ba0bc5b53be94f56535a67ba701a52a52

Makefile

@@ -87,6 +87,10 @@ test-update:
 test-update-templates:
 	-go test ./acceptance -run '^TestAccept/bundle/templates' -update -timeout=${LOCAL_TIMEOUT}
 
+# Regenerate out.test.toml files without running tests
+generate-out-test-toml:
+	go test ./acceptance -run '^TestAccept$$' -only-out-test-toml -timeout=${LOCAL_TIMEOUT}
+
 # Updates acceptance test output (integration tests, requires access)
 test-update-aws:
 	deco env run -i -n aws-prod-ucws -- go test ./acceptance -run ^TestAccept$$ -update -timeout=1h -skiplocal -v
@@ -167,7 +171,7 @@ generate:
 	$(GENKIT_BINARY) update-sdk
 
 
-.PHONY: lint lintfull tidy lintcheck fmt fmtfull test test-unit test-acc test-slow test-slow-unit test-slow-acc cover showcover build snapshot snapshot-release schema integration integration-short acc-cover acc-showcover docs ws wsfix links checks test-update test-update-templates test-update-aws test-update-all generate-validation
+.PHONY: lint lintfull tidy lintcheck fmt fmtfull test test-unit test-acc test-slow test-slow-unit test-slow-acc cover showcover build snapshot snapshot-release schema integration integration-short acc-cover acc-showcover docs ws wsfix links checks test-update test-update-templates generate-out-test-toml test-update-aws test-update-all generate-validation
 
 test-exp-aitools:
 	make test TEST_PACKAGES="./experimental/aitools/..." ACCEPTANCE_TEST_FILTER="TestAccept/idontexistyet/aitools"

NEXT_CHANGELOG.md

@@ -7,7 +7,11 @@
 ### CLI
 
 ### Bundles
+* engine/direct: Fix dependency-ordered deletion by persisting depends_on in state ([#4105](https://github.com/databricks/cli/pull/4105))
+* Pass SYSTEM_ACCESSTOKEN from env to the Terraform provider ([#4135](https://github.com/databricks/cli/pull/4135)
 
 ### Dependency updates
+* Upgrade Go SDK to 0.94.0 ([#4148](https://github.com/databricks/cli/pull/4148))
+* Upgrade Terraform provider to 1.100.0 ([#4150](https://github.com/databricks/cli/pull/4150))
 
 ### API Changes

acceptance/acceptance_test.go

@@ -48,6 +48,7 @@ var (
 	UseVersion      string
 	WorkspaceTmpDir bool
 	TerraformDir    string
+	OnlyOutTestToml bool
 )
 
 // In order to debug CLI running under acceptance test, search for TestInprocessMode and update
@@ -78,6 +79,7 @@ func init() {
 	// creates these symlinks when a file_mirror is used for a provider (in .terraformrc). This flag
 	// allows us to download the provider to the workspace file system on DBR enabling DBR integration testing.
 	flag.StringVar(&TerraformDir, "terraform-dir", "", "Directory to download the terraform provider to")
+	flag.BoolVar(&OnlyOutTestToml, "only-out-test-toml", false, "Only regenerate out.test.toml files without running tests")
 }
 
 const (
@@ -307,14 +309,19 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
 			config, configPath := internal.LoadConfig(t, dir)
 			skipReason := getSkipReason(&config, configPath)
 
-			if testdiff.OverwriteMode {
+			if testdiff.OverwriteMode || OnlyOutTestToml {
 				// Generate materialized config for this test
 				// We do this before skipping the test, so the configs are generated for all tests.
 				materializedConfig, err := internal.GenerateMaterializedConfig(config)
 				require.NoError(t, err)
 				testutil.WriteFile(t, filepath.Join(dir, internal.MaterializedConfigFile), materializedConfig)
 			}
 
+			// If only regenerating out.test.toml, skip the actual test execution
+			if OnlyOutTestToml {
+				t.Skip("Skipping test execution (only regenerating out.test.toml)")
+			}
+
 			if skipReason != "" {
 				skippedDirs += 1
 				t.Skip(skipReason)

acceptance/bundle/artifacts/whl_dynamic/out.plan_create.direct.json

@@ -1,4 +1,6 @@
 {
+  "plan_version": 1,
+  "cli_version": "[DEV_VERSION]",
   "plan": {
     "resources.jobs.test_job": {
       "action": "create",

acceptance/bundle/artifacts/whl_dynamic/out.plan_create.terraform.json

@@ -1,4 +1,6 @@
 {
+  "plan_version": 1,
+  "cli_version": "[DEV_VERSION]",
   "plan": {
     "resources.jobs.test_job": {
       "action": "create"

acceptance/bundle/artifacts/whl_dynamic/out.plan_update.direct.json

@@ -1,4 +1,6 @@
 {
+  "plan_version": 1,
+  "cli_version": "[DEV_VERSION]",
   "plan": {
     "resources.jobs.test_job": {
       "action": "update",

acceptance/bundle/artifacts/whl_dynamic/out.plan_update.terraform.json

@@ -1,4 +1,6 @@
 {
+  "plan_version": 1,
+  "cli_version": "[DEV_VERSION]",
   "plan": {
     "resources.jobs.test_job": {
       "action": "update"

acceptance/bundle/migrate/basic/out.new_state.json

@@ -1,4 +1,6 @@
 {
+ "state_version": 1,
+ "cli_version": "[DEV_VERSION]",
  "lineage": "[UUID]",
  "serial": 6,
  "state": {
@@ -51,7 +53,33 @@
      "volume_catalog_name": "mycat",
      "volume_storage_location": "s3://deco-uc-prod-isolated-aws-us-east-1/metastore/[UUID]/volumes/[UUID]"
     }
-   }
+   },
+   "depends_on": [
+    {
+     "node": "resources.jobs.test_job",
+     "label": "${resources.jobs.test_job.id}"
+    },
+    {
+     "node": "resources.jobs.test_job",
+     "label": "${resources.jobs.test_job.name}"
+    },
+    {
+     "node": "resources.jobs.test_job",
+     "label": "${resources.jobs.test_job.timeout_seconds}"
+    },
+    {
+     "node": "resources.volumes.test_volume",
+     "label": "${resources.volumes.test_volume.catalog_name}"
+    },
+    {
+     "node": "resources.volumes.test_volume",
+     "label": "${resources.volumes.test_volume.id}"
+    },
+    {
+     "node": "resources.volumes.test_volume",
+     "label": "${resources.volumes.test_volume.storage_location}"
+    }
+   ]
   },
   "resources.volumes.test_volume": {
    "__id__": "mycat.myschema.myvol",

acceptance/bundle/migrate/basic/out.plan_update.json

@@ -1,4 +1,6 @@
 {
+  "plan_version": 1,
+  "cli_version": "[DEV_VERSION]",
   "plan": {
     "resources.jobs.test_job": {
       "action": "update",