Revert

Author: kanterov

bundle/docsgen/main.go

@@ -137,7 +137,7 @@ func assignAnnotation(s *jsonschema.Schema, a annotation.Descriptor) {
 		s.Deprecated = true
 		s.DeprecationMessage = a.DeprecationMessage
 	}
-	if a.PythonKeepDeprecated == annotation.PythonKeepDeprecatedTrue {
+	if a.ForceNotDeprecated {
 		s.Deprecated = false
 		s.DeprecationMessage = ""
 	}

bundle/internal/annotation/descriptor.go

@@ -1,12 +1,5 @@
 package annotation
 
-type PythonKeepDeprecated string
-
-const (
-	PythonKeepDeprecatedTrue  PythonKeepDeprecated = "true"
-	PythonKeepDeprecatedUnset PythonKeepDeprecated = ""
-)
-
 type Descriptor struct {
 	Description         string `json:"description,omitempty"`
 	MarkdownDescription string `json:"markdown_description,omitempty"`
@@ -17,8 +10,8 @@ type Descriptor struct {
 	DeprecationMessage  string `json:"deprecation_message,omitempty"`
 	Preview             string `json:"x-databricks-preview,omitempty"`
 
-	// If true, keep the field in Python code even if it is deprecated.
-	PythonKeepDeprecated PythonKeepDeprecated `json:"x-databricks-python-keep-deprecated,omitempty"`
+	// If true, takes priority over 'DeprecationMessage'
+	ForceNotDeprecated bool `json:"force_not_deprecated,omitempty"`
 }
 
 const Placeholder = "PLACEHOLDER"

bundle/internal/schema/annotations.go

@@ -138,8 +138,9 @@ func assignAnnotation(s *jsonschema.Schema, a annotation.Descriptor) {
 		s.Preview = a.Preview
 	}
 
-	if a.PythonKeepDeprecated != annotation.PythonKeepDeprecatedUnset {
-		s.PythonKeepDeprecated = a.PythonKeepDeprecated == annotation.PythonKeepDeprecatedTrue
+	if a.ForceNotDeprecated {
+		s.Deprecated = false
+		s.DeprecationMessage = ""
 	}
 
 	s.MarkdownDescription = convertLinksToAbsoluteUrl(a.MarkdownDescription)

bundle/internal/schema/annotations_openapi_overrides.yml

@@ -210,8 +210,6 @@ github.com/databricks/cli/bundle/config/resources.Job:
       ```
 
       For information about defining job tasks and overriding job settings, see [_](/dev-tools/bundles/job-task-types.md), [_](/dev-tools/bundles/job-task-override.md), and [_](/dev-tools/bundles/cluster-override.md).
-  "format":
-    "x-databricks-python-keep-deprecated": "false"
   "health":
     "description": |-
       PLACEHOLDER
@@ -313,8 +311,6 @@ github.com/databricks/cli/bundle/config/resources.ModelServingEndpoint:
   "permissions":
     "description": |-
       PLACEHOLDER
-  "rate_limits":
-    "x-databricks-python-keep-deprecated": "false"
 github.com/databricks/cli/bundle/config/resources.ModelServingEndpointPermissionLevel:
   "_":
     "enum":
@@ -358,11 +354,11 @@ github.com/databricks/cli/bundle/config/resources.Pipeline:
     "description": |-
       PLACEHOLDER
   "target":
-    "x-databricks-python-keep-deprecated": "true"
+    "force_not_deprecated": |-
+      true
   "trigger":
     "deprecation_message": |-
       Use continuous instead
-    "x-databricks-python-keep-deprecated": "false"
 github.com/databricks/cli/bundle/config/resources.PipelinePermissionLevel:
   "_":
     "enum":
@@ -714,26 +710,17 @@ github.com/databricks/databricks-sdk-go/service/compute.DockerImage:
     "description": |-
       PLACEHOLDER
 github.com/databricks/databricks-sdk-go/service/compute.Environment:
-  "client":
-    "x-databricks-python-keep-deprecated": "true"
   "dependencies":
     "description": |-
       List of pip dependencies, as supported by the version of pip in this environment.
 github.com/databricks/databricks-sdk-go/service/compute.GcpAttributes:
   "availability":
     "description": |-
       PLACEHOLDER
-  "use_preemptible_executors":
-    "x-databricks-python-keep-deprecated": "false"
 github.com/databricks/databricks-sdk-go/service/compute.InitScriptInfo:
   "abfss":
     "description": |-
       Contains the Azure Data Lake Storage destination path
-  "dbfs":
-    "x-databricks-python-keep-deprecated": "false"
-github.com/databricks/databricks-sdk-go/service/compute.Library:
-  "egg":
-    "x-databricks-python-keep-deprecated": "false"
 github.com/databricks/databricks-sdk-go/service/compute.LogAnalyticsInfo:
   "log_analytics_primary_key":
     "description": |-
@@ -756,9 +743,6 @@ github.com/databricks/databricks-sdk-go/service/jobs.GitSource:
   "git_snapshot":
     "description": |-
       PLACEHOLDER
-github.com/databricks/databricks-sdk-go/service/jobs.JobEmailNotifications:
-  "no_alert_for_skipped_runs":
-    "x-databricks-python-keep-deprecated": "false"
 github.com/databricks/databricks-sdk-go/service/jobs.JobEnvironment:
   "spec":
     "description": |-
@@ -778,11 +762,6 @@ github.com/databricks/databricks-sdk-go/service/jobs.RunJobTask:
   "python_named_params":
     "description": |-
       PLACEHOLDER
-github.com/databricks/databricks-sdk-go/service/jobs.SparkJarTask:
-  "jar_uri":
-    "x-databricks-python-keep-deprecated": "false"
-  "run_as_repl":
-    "x-databricks-python-keep-deprecated": "false"
 github.com/databricks/databricks-sdk-go/service/jobs.Subscription:
   "subscribers":
     "description": |-
@@ -804,9 +783,6 @@ github.com/databricks/databricks-sdk-go/service/jobs.Task:
   "health":
     "description": |-
       PLACEHOLDER
-github.com/databricks/databricks-sdk-go/service/jobs.TaskEmailNotifications:
-  "no_alert_for_skipped_runs":
-    "x-databricks-python-keep-deprecated": "false"
 github.com/databricks/databricks-sdk-go/service/jobs.TriggerSettings:
   "table_update":
     "description": |-
@@ -822,26 +798,17 @@ github.com/databricks/databricks-sdk-go/service/pipelines.CronTrigger:
   "timezone_id":
     "description": |-
       PLACEHOLDER
-github.com/databricks/databricks-sdk-go/service/pipelines.IngestionGatewayPipelineDefinition:
-  "connection_id":
-    "x-databricks-python-keep-deprecated": "false"
 github.com/databricks/databricks-sdk-go/service/pipelines.PipelineLibrary:
   "whl":
     "deprecation_message": |-
       This field is deprecated
-    "x-databricks-python-keep-deprecated": "false"
 github.com/databricks/databricks-sdk-go/service/pipelines.PipelineTrigger:
   "cron":
     "description": |-
       PLACEHOLDER
   "manual":
     "description": |-
       PLACEHOLDER
-github.com/databricks/databricks-sdk-go/service/serving.AiGatewayGuardrailParameters:
-  "invalid_keywords":
-    "x-databricks-python-keep-deprecated": "false"
-  "valid_topics":
-    "x-databricks-python-keep-deprecated": "false"
 github.com/databricks/databricks-sdk-go/service/serving.Route:
   "served_entity_name":
     "description": |-

bundle/internal/schema/parser.go

@@ -196,11 +196,6 @@ func (p *openapiParser) extractAnnotations(typ reflect.Type, outputPath, overrid
 					if description == "" {
 						addEmptyOverride(k, basePath, overrides)
 					}
-
-					// if field got deprecated outside of preview it can't be just removed and we keep it
-					if refProp.Deprecated && refProp.Preview != "PRIVATE" {
-						addPythonKeepDeprecatedOverride(k, basePath, overrides)
-					}
 				} else {
 					addEmptyOverride(k, basePath, overrides)
 				}
@@ -246,46 +241,22 @@ func prependCommentToFile(outputPath, comment string) error {
 	return err
 }
 
-// addPythonKeepDeprecatedOverride adds an override with "x-databricks-python-keep-deprecated: true" to
-// annotations_openapi_overrides.yaml unless it already specifies a value for "x-databricks-python-keep-deprecated".
-//
-// This way if field got deprecated, we add an override to keep it in Python code, until we revisit deprecation.
-func addPythonKeepDeprecatedOverride(key, pkg string, overridesFile annotation.File) {
-	if overridesFile[pkg] == nil {
-		overridesFile[pkg] = map[string]annotation.Descriptor{}
-	}
-
-	overrides := overridesFile[pkg]
-
-	a, ok := overrides[key]
-	if !ok {
-		a = annotation.Descriptor{}
-	}
-
-	// if we don't have explicit value, it means that field just got deprecated,
-	// and we should keep it in Python code
-	if a.PythonKeepDeprecated == annotation.PythonKeepDeprecatedUnset {
-		a.PythonKeepDeprecated = annotation.PythonKeepDeprecatedTrue
-	}
-
-	overrides[key] = a
-}
-
 func addEmptyOverride(key, pkg string, overridesFile annotation.File) {
 	if overridesFile[pkg] == nil {
 		overridesFile[pkg] = map[string]annotation.Descriptor{}
 	}
 
 	overrides := overridesFile[pkg]
+	if overrides[key].Description == "" {
+		overrides[key] = annotation.Descriptor{Description: annotation.Placeholder}
+	}
 
 	a, ok := overrides[key]
 	if !ok {
 		a = annotation.Descriptor{}
 	}
-
 	if a.Description == "" {
 		a.Description = annotation.Placeholder
 	}
-
 	overrides[key] = a
 }