update (databricks#3583)

edwardfeng-db · web-flow · commit 69fc37463732 · 2024-05-16T09:57:37.000Z
diff --git a/common/customizable_schema.go b/common/customizable_schema.go
@@ -194,7 +194,7 @@ func (s *CustomizableSchema) SetConflictsWith(value []string) *CustomizableSchem
 		panic("SetConflictsWith cannot take in an empty list")
 	}
 	if s.pathContainsMultipleItemsList() {
-		log.Printf("[DEBUG] ConflictsWith skipped for %v, path contains TypeList block with MaxItems not equal to 1", strings.Join(s.path, "."))
+		log.Printf("[DEBUG] ConflictsWith skipped for %v, path contains TypeList block with MaxItems not equal to 1", getPrefixedValue(s.context.path, value))
 		return s
 	}
 	s.Schema.ConflictsWith = getPrefixedValue(s.context.path, value)
@@ -206,7 +206,7 @@ func (s *CustomizableSchema) SetExactlyOneOf(value []string) *CustomizableSchema
 		panic("SetExactlyOneOf cannot take in an empty list")
 	}
 	if s.pathContainsMultipleItemsList() {
-		log.Printf("[DEBUG] ExactlyOneOf skipped for %v, path contains TypeList block with MaxItems not equal to 1", strings.Join(s.path, "."))
+		log.Printf("[DEBUG] ExactlyOneOf skipped for %v, path contains TypeList block with MaxItems not equal to 1", getPrefixedValue(s.context.path, value))
 		return s
 	}
 	s.Schema.ExactlyOneOf = getPrefixedValue(s.context.path, value)
@@ -218,7 +218,7 @@ func (s *CustomizableSchema) SetAtLeastOneOf(value []string) *CustomizableSchema
 		panic("SetAtLeastOneOf cannot take in an empty list")
 	}
 	if s.pathContainsMultipleItemsList() {
-		log.Printf("[DEBUG] AtLeastOneOf skipped for %v, path contains TypeList block with MaxItems not equal to 1", strings.Join(s.path, "."))
+		log.Printf("[DEBUG] AtLeastOneOf skipped for %v, path contains TypeList block with MaxItems not equal to 1", getPrefixedValue(s.context.path, value))
 		return s
 	}
 	s.Schema.AtLeastOneOf = getPrefixedValue(s.context.path, value)
@@ -230,7 +230,7 @@ func (s *CustomizableSchema) SetRequiredWith(value []string) *CustomizableSchema
 		panic("SetRequiredWith cannot take in an empty list")
 	}
 	if s.pathContainsMultipleItemsList() {
-		log.Printf("[DEBUG] SetRequiredWith skipped for %v, path contains TypeList block with MaxItems not equal to 1", strings.Join(s.path, "."))
+		log.Printf("[DEBUG] SetRequiredWith skipped for %v, path contains TypeList block with MaxItems not equal to 1", getPrefixedValue(s.context.path, value))
 		return s
 	}
 	s.Schema.RequiredWith = getPrefixedValue(s.context.path, value)

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ func (s CustomizableSchema) SetConflictsWith(value []string) CustomizableSchem`
`194`	`194`	`panic("SetConflictsWith cannot take in an empty list")`
`195`	`195`	`}`
`196`	`196`	`if s.pathContainsMultipleItemsList() {`
`197`		`- log.Printf("[DEBUG] ConflictsWith skipped for %v, path contains TypeList block with MaxItems not equal to 1", strings.Join(s.path, "."))`
	`197`	`+ log.Printf("[DEBUG] ConflictsWith skipped for %v, path contains TypeList block with MaxItems not equal to 1", getPrefixedValue(s.context.path, value))`
`198`	`198`	`return s`
`199`	`199`	`}`
`200`	`200`	`s.Schema.ConflictsWith = getPrefixedValue(s.context.path, value)`
`@@ -206,7 +206,7 @@ func (s CustomizableSchema) SetExactlyOneOf(value []string) CustomizableSchema`
`206`	`206`	`panic("SetExactlyOneOf cannot take in an empty list")`
`207`	`207`	`}`
`208`	`208`	`if s.pathContainsMultipleItemsList() {`
`209`		`- log.Printf("[DEBUG] ExactlyOneOf skipped for %v, path contains TypeList block with MaxItems not equal to 1", strings.Join(s.path, "."))`
	`209`	`+ log.Printf("[DEBUG] ExactlyOneOf skipped for %v, path contains TypeList block with MaxItems not equal to 1", getPrefixedValue(s.context.path, value))`
`210`	`210`	`return s`
`211`	`211`	`}`
`212`	`212`	`s.Schema.ExactlyOneOf = getPrefixedValue(s.context.path, value)`
`@@ -218,7 +218,7 @@ func (s CustomizableSchema) SetAtLeastOneOf(value []string) CustomizableSchema`
`218`	`218`	`panic("SetAtLeastOneOf cannot take in an empty list")`
`219`	`219`	`}`
`220`	`220`	`if s.pathContainsMultipleItemsList() {`
`221`		`- log.Printf("[DEBUG] AtLeastOneOf skipped for %v, path contains TypeList block with MaxItems not equal to 1", strings.Join(s.path, "."))`
	`221`	`+ log.Printf("[DEBUG] AtLeastOneOf skipped for %v, path contains TypeList block with MaxItems not equal to 1", getPrefixedValue(s.context.path, value))`
`222`	`222`	`return s`
`223`	`223`	`}`
`224`	`224`	`s.Schema.AtLeastOneOf = getPrefixedValue(s.context.path, value)`
`@@ -230,7 +230,7 @@ func (s CustomizableSchema) SetRequiredWith(value []string) CustomizableSchema`
`230`	`230`	`panic("SetRequiredWith cannot take in an empty list")`
`231`	`231`	`}`
`232`	`232`	`if s.pathContainsMultipleItemsList() {`
`233`		`- log.Printf("[DEBUG] SetRequiredWith skipped for %v, path contains TypeList block with MaxItems not equal to 1", strings.Join(s.path, "."))`
	`233`	`+ log.Printf("[DEBUG] SetRequiredWith skipped for %v, path contains TypeList block with MaxItems not equal to 1", getPrefixedValue(s.context.path, value))`
`234`	`234`	`return s`
`235`	`235`	`}`
`236`	`236`	`s.Schema.RequiredWith = getPrefixedValue(s.context.path, value)`