Merge df97a5bb93 into 1508d65c4c

bundle/config/mutator/initialize_urls_test.go

@@ -65,8 +65,9 @@ func TestInitializeURLs(t *testing.T) {
 				},
 				QualityMonitors: map[string]*resources.QualityMonitor{
 					"qualityMonitor1": {
-						TableName:     "catalog.schema.qualityMonitor1",
+						CreateMonitor: &catalog.CreateMonitor{
-						CreateMonitor: &catalog.CreateMonitor{},
+							TableName: "catalog.schema.qualityMonitor1",
+						},
 					},
 				},
 				Schemas: map[string]*resources.Schema{

bundle/config/mutator/prepend_workspace_prefix.go

@@ -44,11 +44,6 @@ func (m *prependWorkspacePrefix) Apply(ctx context.Context, b *bundle.Bundle) di
 					return dyn.InvalidValue, fmt.Errorf("expected string, got %s", v.Kind())
 				}
 
-				// Skip prefixing if the path does not start with /, it might be variable reference or smth else.
-				if !strings.HasPrefix(path, "/") {
-					return pv, nil
-				}
-
 				for _, prefix := range skipPrefixes {
 					if strings.HasPrefix(path, prefix) {
 						return pv, nil

bundle/config/mutator/prepend_workspace_prefix_test.go

@@ -31,14 +31,6 @@ func TestPrependWorkspacePrefix(t *testing.T) {
 			path:     "/Volumes/Users/test",
 			expected: "/Volumes/Users/test",
 		},
-		{
-			path:     "~/test",
-			expected: "~/test",
-		},
-		{
-			path:     "${workspace.file_path}/test",
-			expected: "${workspace.file_path}/test",
-		},
 	}
 
 	for _, tc := range testCases {

bundle/config/mutator/process_target_mode_test.go

@@ -102,23 +102,16 @@ func mockBundle(mode config.Mode) *bundle.Bundle {
 					"registeredmodel1": {CreateRegisteredModelRequest: &catalog.CreateRegisteredModelRequest{Name: "registeredmodel1"}},
 				},
 				QualityMonitors: map[string]*resources.QualityMonitor{
-					"qualityMonitor1": {
+					"qualityMonitor1": {CreateMonitor: &catalog.CreateMonitor{TableName: "qualityMonitor1"}},
-						TableName: "qualityMonitor1",
-						CreateMonitor: &catalog.CreateMonitor{
-							OutputSchemaName: "catalog.schema",
-						},
-					},
 					"qualityMonitor2": {
-						TableName: "qualityMonitor2",
 						CreateMonitor: &catalog.CreateMonitor{
-							OutputSchemaName: "catalog.schema",
+							TableName: "qualityMonitor2",
-							Schedule:         &catalog.MonitorCronSchedule{},
+							Schedule:  &catalog.MonitorCronSchedule{},
 						},
 					},
 					"qualityMonitor3": {
-						TableName: "qualityMonitor3",
 						CreateMonitor: &catalog.CreateMonitor{
-							OutputSchemaName: "catalog.schema",
+							TableName: "qualityMonitor3",
 							Schedule: &catalog.MonitorCronSchedule{
 								PauseStatus: catalog.MonitorCronSchedulePauseStatusUnpaused,
 							},

bundle/config/resources/quality_monitor.go

@@ -13,15 +13,17 @@ import (
 )
 
 type QualityMonitor struct {
-	ID             string         `json:"id,omitempty" bundle:"readonly"`
+	// Represents the Input Arguments for Terraform and will get
+	// converted to a HCL representation for CRUD
+	*catalog.CreateMonitor
+
+	// This represents the id which is the full name of the monitor
+	// (catalog_name.schema_name.table_name) that can be used
+	// as a reference in other resources. This value is returned by terraform.
+	ID string `json:"id,omitempty" bundle:"readonly"`
+
 	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
 	URL            string         `json:"url,omitempty" bundle:"internal"`
-
-	// The table name is a required field but not included as a JSON field in [catalog.CreateMonitor].
-	TableName string `json:"table_name"`
-
-	// This struct defines the creation payload for a monitor.
-	*catalog.CreateMonitor
 }
 
 func (s *QualityMonitor) UnmarshalJSON(b []byte) error {

bundle/deploy/terraform/tfdyn/convert_quality_monitor_test.go

@@ -15,8 +15,8 @@ import (
 
 func TestConvertQualityMonitor(t *testing.T) {
 	var src = resources.QualityMonitor{
-		TableName: "test_table_name",
 		CreateMonitor: &catalog.CreateMonitor{
+			TableName:        "test_table_name",
 			AssetsDir:        "assets_dir",
 			OutputSchemaName: "output_schema_name",
 			InferenceLog: &catalog.MonitorInferenceLog{

bundle/internal/schema/testdata/pass/quality_monitor.yml

@@ -4,7 +4,6 @@ bundle:
 resources:
   quality_monitors:
     myqualitymonitor:
-      table_name: catalog.schema.quality_monitor
       inference_log:
         granularities:
           - a

bundle/schema/jsonschema.json

@@ -684,9 +684,6 @@
                         "description": "Configuration for monitoring snapshot tables.",
                         "$ref": "#/$defs/github.com/databricks/databricks-sdk-go/service/catalog.MonitorSnapshot"
                       },
-                      "table_name": {
-                        "$ref": "#/$defs/string"
-                      },
                       "time_series": {
                         "description": "Configuration for monitoring time series tables.",
                         "$ref": "#/$defs/github.com/databricks/databricks-sdk-go/service/catalog.MonitorTimeSeries"
@@ -698,7 +695,6 @@
                     },
                     "additionalProperties": false,
                     "required": [
-                      "table_name",
                       "assets_dir",
                       "output_schema_name"
                     ]

libs/dyn/convert/struct_info.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"github.com/databricks/cli/libs/dyn"
+	"github.com/databricks/cli/libs/textutil"
 )
 
 // structInfo holds the type information we need to efficiently
@@ -84,6 +85,14 @@ func buildStructInfo(typ reflect.Type) structInfo {
 			}
 
 			name, _, _ := strings.Cut(sf.Tag.Get("json"), ",")
+			if typ.Name() == "QualityMonitor" && name == "-" {
+				urlName, _, _ := strings.Cut(sf.Tag.Get("url"), ",")
+				if urlName == "" || urlName == "-" {
+					name = textutil.CamelToSnakeCase(sf.Name)
+				} else {
+					name = urlName
+				}
+			}
 			if name == "" || name == "-" {
 				continue
 			}