Convert artifact_path_with_volume to acceptance test (#3180)

Author: denik

acceptance/bundle/artifacts/artifact_path_with_volume/common_script.sh

@@ -0,0 +1,5 @@
+export SCHEMA_NAME=schema-$UNIQUE_NAME
+trace envsubst < $TESTDIR/../databricks.yml.tmpl > databricks.yml
+trap "trace '$CLI' schemas delete main.$SCHEMA_NAME" EXIT
+trace $CLI schemas create $SCHEMA_NAME main | jq 'del(.effective_predictive_optimization_flag.inherited_from_name)'
+trace musterr $CLI bundle deploy

acceptance/bundle/artifacts/artifact_path_with_volume/databricks.yml.tmpl

@@ -0,0 +1,14 @@
+bundle:
+  name: artifact_path_with_volume-$UNIQUE_NAME
+
+workspace:
+  root_path: "~/.bundle/$UNIQUE_NAME"
+  artifact_path: /Volumes/main/$SCHEMA_NAME/$VOLUME_NAME
+
+resources:
+  volumes:
+    foo:
+      catalog_name: main
+      name: my_volume
+      schema_name: $SCHEMA_NAME
+      volume_type: MANAGED

acceptance/bundle/artifacts/artifact_path_with_volume/test.toml

@@ -0,0 +1,3 @@
+Local = false
+Cloud = true
+RecordRequests = false

acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/output.txt

@@ -0,0 +1,33 @@
+
+>>> envsubst
+
+>>> [CLI] schemas create schema-[UNIQUE_NAME] main
+{
+  "browse_only": false,
+  "catalog_name": "main",
+  "catalog_type": "MANAGED_CATALOG",
+  "created_at": [UNIX_TIME_MILLIS],
+  "created_by": "[USERNAME]",
+  "effective_predictive_optimization_flag": {
+    "inherited_from_type": "METASTORE",
+    "value": "DISABLE"
+  },
+  "enable_predictive_optimization": "INHERIT",
+  "full_name": "main.schema-[UNIQUE_NAME]",
+  "metastore_id": "[UUID]",
+  "name": "schema-[UNIQUE_NAME]",
+  "owner": "[USERNAME]",
+  "schema_id": "[UUID]",
+  "updated_at": [UNIX_TIME_MILLIS],
+  "updated_by": "[USERNAME]"
+}
+
+>>> musterr [CLI] bundle deploy
+Error: volume main.schema-[UNIQUE_NAME].doesnotexist does not exist
+  at workspace.artifact_path
+  in databricks.yml:6:18
+
+
+Exit code (musterr): 1
+
+>>> [CLI] schemas delete main.schema-[UNIQUE_NAME]

acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/script

@@ -0,0 +1,2 @@
+export VOLUME_NAME=doesnotexist
+source $TESTDIR/../common_script.sh

acceptance/bundle/artifacts/artifact_path_with_volume/volume_doesnot_exist/test.toml

@@ -0,0 +1,2 @@
+Cloud = true
+RequiresUnityCatalog = true

acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/output.txt

@@ -0,0 +1,40 @@
+
+>>> envsubst
+
+>>> [CLI] schemas create schema-[UNIQUE_NAME] main
+{
+  "browse_only": false,
+  "catalog_name": "main",
+  "catalog_type": "MANAGED_CATALOG",
+  "created_at": [UNIX_TIME_MILLIS],
+  "created_by": "[USERNAME]",
+  "effective_predictive_optimization_flag": {
+    "inherited_from_type": "METASTORE",
+    "value": "DISABLE"
+  },
+  "enable_predictive_optimization": "INHERIT",
+  "full_name": "main.schema-[UNIQUE_NAME]",
+  "metastore_id": "[UUID]",
+  "name": "schema-[UNIQUE_NAME]",
+  "owner": "[USERNAME]",
+  "schema_id": "[UUID]",
+  "updated_at": [UNIX_TIME_MILLIS],
+  "updated_by": "[USERNAME]"
+}
+
+>>> musterr [CLI] bundle deploy
+Error: volume main.schema-[UNIQUE_NAME].my_volume does not exist
+  at workspace.artifact_path
+     resources.volumes.foo
+  in databricks.yml:6:18
+     databricks.yml:11:7
+
+You are using a volume in your artifact_path that is managed by
+this bundle but which has not been deployed yet. Please first deploy
+the volume using 'bundle deploy' and then switch over to using it in
+the artifact_path.
+
+
+Exit code (musterr): 1
+
+>>> [CLI] schemas delete main.schema-[UNIQUE_NAME]

acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/script

@@ -0,0 +1,2 @@
+export VOLUME_NAME=my_volume
+source $TESTDIR/../common_script.sh

acceptance/bundle/artifacts/artifact_path_with_volume/volume_not_deployed/test.toml

@@ -0,0 +1,3 @@
+Badness = "Requires two bundles; one for volumes, another for artifacts. Ideally it would just work but today we first upload then deploy, so it does not fit in that architecture."
+Cloud = true
+RequiresUnityCatalog = true

integration/bundle/artifacts_test.go

@@ -1,7 +1,6 @@
 package bundle_test
 
 import (
-	"fmt"
 	"os"
 	"path"
 	"path/filepath"
@@ -13,14 +12,8 @@ import (
 	"github.com/databricks/cli/bundle/config/resources"
 	"github.com/databricks/cli/bundle/libraries"
 	"github.com/databricks/cli/integration/internal/acc"
-	"github.com/databricks/cli/internal/testcli"
-	"github.com/databricks/cli/internal/testutil"
-	"github.com/databricks/cli/libs/env"
-	"github.com/databricks/databricks-sdk-go/service/catalog"
 	"github.com/databricks/databricks-sdk-go/service/compute"
 	"github.com/databricks/databricks-sdk-go/service/jobs"
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -228,82 +221,3 @@ func TestUploadArtifactFileToCorrectRemotePathForVolumes(t *testing.T) {
 		b.Config.Resources.Jobs["test"].JobSettings.Tasks[0].Libraries[0].Whl,
 	)
 }
-
-func TestUploadArtifactFileToVolumeThatDoesNotExist(t *testing.T) {
-	ctx, wt := acc.UcWorkspaceTest(t)
-	w := wt.W
-
-	schemaName := testutil.RandomName("schema-")
-
-	_, err := w.Schemas.Create(ctx, catalog.CreateSchema{
-		CatalogName: "main",
-		Comment:     "test schema",
-		Name:        schemaName,
-	})
-	require.NoError(t, err)
-
-	t.Cleanup(func() {
-		err = w.Schemas.DeleteByFullName(ctx, "main."+schemaName)
-		require.NoError(t, err)
-	})
-
-	bundleRoot := initTestTemplate(t, ctx, "artifact_path_with_volume", map[string]any{
-		"unique_id":   uuid.New().String(),
-		"schema_name": schemaName,
-		"volume_name": "doesnotexist",
-	})
-
-	ctx = env.Set(ctx, "BUNDLE_ROOT", bundleRoot)
-	stdout, stderr, err := testcli.RequireErrorRun(t, ctx, "bundle", "deploy")
-
-	assert.Error(t, err)
-	assert.Equal(t, fmt.Sprintf(`Error: volume main.%s.doesnotexist does not exist
-  at workspace.artifact_path
-  in databricks.yml:6:18
-
-`, schemaName), stdout.String())
-	assert.Equal(t, "", stderr.String())
-}
-
-func TestUploadArtifactToVolumeNotYetDeployed(t *testing.T) {
-	ctx, wt := acc.UcWorkspaceTest(t)
-	w := wt.W
-
-	schemaName := testutil.RandomName("schema-")
-
-	_, err := w.Schemas.Create(ctx, catalog.CreateSchema{
-		CatalogName: "main",
-		Comment:     "test schema",
-		Name:        schemaName,
-	})
-	require.NoError(t, err)
-
-	t.Cleanup(func() {
-		err = w.Schemas.DeleteByFullName(ctx, "main."+schemaName)
-		require.NoError(t, err)
-	})
-
-	bundleRoot := initTestTemplate(t, ctx, "artifact_path_with_volume", map[string]any{
-		"unique_id":   uuid.New().String(),
-		"schema_name": schemaName,
-		"volume_name": "my_volume",
-	})
-
-	ctx = env.Set(ctx, "BUNDLE_ROOT", bundleRoot)
-	stdout, stderr, err := testcli.RequireErrorRun(t, ctx, "bundle", "deploy")
-
-	assert.Error(t, err)
-	assert.Equal(t, fmt.Sprintf(`Error: volume main.%s.my_volume does not exist
-  at workspace.artifact_path
-     resources.volumes.foo
-  in databricks.yml:6:18
-     databricks.yml:11:7
-
-You are using a volume in your artifact_path that is managed by
-this bundle but which has not been deployed yet. Please first deploy
-the volume using 'bundle deploy' and then switch over to using it in
-the artifact_path.
-
-`, schemaName), stdout.String())
-	assert.Equal(t, "", stderr.String())
-}