From f10038a20e0e0cd52288ccf722429b4eb3fc1fed Mon Sep 17 00:00:00 2001 From: Shreyas Goenka Date: Sun, 15 Sep 2024 23:45:01 +0200 Subject: [PATCH] - --- bundle/config/mutator/process_target_mode_test.go | 7 +++++++ bundle/deploy/terraform/tfdyn/convert_volume_test.go | 2 +- bundle/libraries/upload.go | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bundle/config/mutator/process_target_mode_test.go b/bundle/config/mutator/process_target_mode_test.go index 42f1929c8..75888a125 100644 --- a/bundle/config/mutator/process_target_mode_test.go +++ b/bundle/config/mutator/process_target_mode_test.go @@ -119,6 +119,9 @@ func mockBundle(mode config.Mode) *bundle.Bundle { Schemas: map[string]*resources.Schema{ "schema1": {CreateSchema: &catalog.CreateSchema{Name: "schema1"}}, }, + Volumes: map[string]*resources.Volume{ + "volume1": {CreateVolumeRequestContent: &catalog.CreateVolumeRequestContent{Name: "volume1"}}, + }, }, }, // Use AWS implementation for testing. @@ -281,6 +284,8 @@ func TestProcessTargetModeDefault(t *testing.T) { assert.Equal(t, "servingendpoint1", b.Config.Resources.ModelServingEndpoints["servingendpoint1"].Name) assert.Equal(t, "registeredmodel1", b.Config.Resources.RegisteredModels["registeredmodel1"].Name) assert.Equal(t, "qualityMonitor1", b.Config.Resources.QualityMonitors["qualityMonitor1"].TableName) + assert.Equal(t, "schema1", b.Config.Resources.Schemas["schema1"].Name) + assert.Equal(t, "volume1", b.Config.Resources.Volumes["volume1"].Name) } func TestProcessTargetModeProduction(t *testing.T) { @@ -322,6 +327,8 @@ func TestProcessTargetModeProduction(t *testing.T) { assert.Equal(t, "servingendpoint1", b.Config.Resources.ModelServingEndpoints["servingendpoint1"].Name) assert.Equal(t, "registeredmodel1", b.Config.Resources.RegisteredModels["registeredmodel1"].Name) assert.Equal(t, "qualityMonitor1", b.Config.Resources.QualityMonitors["qualityMonitor1"].TableName) + assert.Equal(t, "schema1", b.Config.Resources.Schemas["schema1"].Name) + assert.Equal(t, "volume1", b.Config.Resources.Volumes["volume1"].Name) } func TestProcessTargetModeProductionOkForPrincipal(t *testing.T) { diff --git a/bundle/deploy/terraform/tfdyn/convert_volume_test.go b/bundle/deploy/terraform/tfdyn/convert_volume_test.go index ded32fcbc..c897ae69a 100644 --- a/bundle/deploy/terraform/tfdyn/convert_volume_test.go +++ b/bundle/deploy/terraform/tfdyn/convert_volume_test.go @@ -51,7 +51,7 @@ func TestConvertVolume(t *testing.T) { "schema_name": "schema", "storage_location": "s3://bucket/path", "volume_type": "EXTERNAL", - }, out.Schema["my_volume"]) + }, out.Volume["my_volume"]) // Assert equality on the grants assert.Equal(t, &schema.ResourceGrants{ diff --git a/bundle/libraries/upload.go b/bundle/libraries/upload.go index 060468047..0e6511893 100644 --- a/bundle/libraries/upload.go +++ b/bundle/libraries/upload.go @@ -244,6 +244,7 @@ func GetFilerForLibraries(ctx context.Context, b *bundle.Bundle, uploadPath stri // The volume does not exist. Check if the volume is defined in the bundle. // TODO: Note that this is not a breaking change. + // TODO: Include error as well for why the stat call failed. It's more context. l, ok := locationForVolume(b, catalogName, schemaName, volumeName) if !ok { return nil, diag.Errorf("the bundle is configured to upload artifacts to %s but a UC volume at %s does not exist", uploadPath, volumePath)