omitempty

andrewnester · andrewnester · commit 7e5b1fbba41f · 2025-09-02T16:53:39.000+02:00
diff --git a/bundle/config/resources/apps.go b/bundle/config/resources/apps.go
@@ -42,7 +42,7 @@ type App struct {
 	URL            string          `json:"url,omitempty" bundle:"internal"`
 
 	apps.App
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (a *App) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/clusters.go b/bundle/config/resources/clusters.go
@@ -29,7 +29,7 @@ type Cluster struct {
 	URL            string              `json:"url,omitempty" bundle:"internal"`
 
 	compute.ClusterSpec
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (s *Cluster) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/dashboard.go b/bundle/config/resources/dashboard.go
@@ -51,7 +51,7 @@ type Dashboard struct {
 	URL            string                `json:"url,omitempty" bundle:"internal"`
 
 	DashboardConfig
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 
 	// FilePath points to the local `.lvdash.json` file containing the dashboard definition.
 	// This is inlined into serialized_dashboard during deployment. The file_path is kept around
diff --git a/bundle/config/resources/database_instance.go b/bundle/config/resources/database_instance.go
@@ -29,7 +29,7 @@ type DatabaseInstance struct {
 	ModifiedStatus ModifiedStatus               `json:"modified_status,omitempty" bundle:"internal"`
 
 	database.DatabaseInstance
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (d *DatabaseInstance) Exists(ctx context.Context, w *databricks.WorkspaceClient, name string) (bool, error) {
diff --git a/bundle/config/resources/job.go b/bundle/config/resources/job.go
@@ -30,7 +30,7 @@ type Job struct {
 	URL            string          `json:"url,omitempty" bundle:"internal"`
 
 	jobs.JobSettings
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (j *Job) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/mlflow_experiment.go b/bundle/config/resources/mlflow_experiment.go
@@ -29,7 +29,7 @@ type MlflowExperiment struct {
 	URL            string                       `json:"url,omitempty" bundle:"internal"`
 
 	ml.Experiment
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (s *MlflowExperiment) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/mlflow_model.go b/bundle/config/resources/mlflow_model.go
@@ -29,7 +29,7 @@ type MlflowModel struct {
 	URL            string                  `json:"url,omitempty" bundle:"internal"`
 
 	ml.CreateModelRequest
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (s *MlflowModel) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/model_serving_endpoint.go b/bundle/config/resources/model_serving_endpoint.go
@@ -26,7 +26,7 @@ type ModelServingEndpoint struct {
 	// This represents the input args for terraform, and will get converted
 	// to a HCL representation for CRUD
 	serving.CreateServingEndpoint
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 
 	// This represents the id (ie serving_endpoint_id) that can be used
 	// as a reference in other resources. This value is returned by terraform.
diff --git a/bundle/config/resources/pipeline.go b/bundle/config/resources/pipeline.go
@@ -29,7 +29,7 @@ type Pipeline struct {
 	URL            string               `json:"url,omitempty" bundle:"internal"`
 
 	pipelines.CreatePipeline
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (p *Pipeline) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/quality_monitor.go b/bundle/config/resources/quality_monitor.go
@@ -21,7 +21,7 @@ type QualityMonitor struct {
 
 	// This struct defines the creation payload for a monitor.
 	catalog.CreateMonitor
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (s *QualityMonitor) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/registered_model.go b/bundle/config/resources/registered_model.go
@@ -24,7 +24,7 @@ type RegisteredModel struct {
 	// This represents the input args for terraform, and will get converted
 	// to a HCL representation for CRUD
 	catalog.CreateRegisteredModelRequest
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 
 	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
 	URL            string         `json:"url,omitempty" bundle:"internal"`
diff --git a/bundle/config/resources/schema.go b/bundle/config/resources/schema.go
@@ -68,7 +68,7 @@ type Schema struct {
 	ID string `json:"id,omitempty" bundle:"readonly"`
 
 	catalog.CreateSchema
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 
 	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
 	URL            string         `json:"url,omitempty" bundle:"internal"`
diff --git a/bundle/config/resources/secret_scope.go b/bundle/config/resources/secret_scope.go
@@ -44,7 +44,7 @@ type SecretScope struct {
 	// The metadata for the secret scope if the type is `AZURE_KEYVAULT`
 	KeyvaultMetadata *workspace.AzureKeyVaultSecretScopeMetadata `json:"keyvault_metadata,omitempty"`
 
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (s *SecretScope) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/sql_warehouses.go b/bundle/config/resources/sql_warehouses.go
@@ -28,7 +28,7 @@ type SqlWarehouse struct {
 	URL            string                   `json:"url,omitempty" bundle:"internal"`
 
 	sql.CreateWarehouseRequest
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (sw *SqlWarehouse) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/volume.go b/bundle/config/resources/volume.go
@@ -49,7 +49,7 @@ type Volume struct {
 	ID string `json:"id,omitempty" bundle:"readonly"`
 
 	catalog.CreateVolumeRequestContent
-	Lifecycle Lifecycle `json:"lifecycle"`
+	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 
 	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
 	URL            string         `json:"url,omitempty" bundle:"internal"`
diff --git a/libs/structwalk/walktype_test.go b/libs/structwalk/walktype_test.go
@@ -123,7 +123,7 @@ func TestTypeJobSettings(t *testing.T) {
 func TestTypeRoot(t *testing.T) {
 	testStruct(t,
 		reflect.TypeOf(config.Root{}),
-		3600, 4000, // 3980 at the time of the update
+		4000, 4300, // 4003 at the time of the update
 		map[string]any{
 			".bundle.target":                 "",
 			`.variables[*].lookup.dashboard`: "",

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ type App struct {`
`42`	`42`	URL string `json:"url,omitempty" bundle:"internal"`
`43`	`43`
`44`	`44`	`apps.App`
`45`		- Lifecycle Lifecycle `json:"lifecycle"`
	`45`	+ Lifecycle Lifecycle `json:"lifecycle,omitempty"`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`func (a *App) UnmarshalJSON(b []byte) error {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type Cluster struct {`
`29`	`29`	URL string `json:"url,omitempty" bundle:"internal"`
`30`	`30`
`31`	`31`	`compute.ClusterSpec`
`32`		- Lifecycle Lifecycle `json:"lifecycle"`
	`32`	+ Lifecycle Lifecycle `json:"lifecycle,omitempty"`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (s *Cluster) UnmarshalJSON(b []byte) error {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type DatabaseInstance struct {`
`29`	`29`	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
`30`	`30`
`31`	`31`	`database.DatabaseInstance`
`32`		- Lifecycle Lifecycle `json:"lifecycle"`
	`32`	+ Lifecycle Lifecycle `json:"lifecycle,omitempty"`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (d DatabaseInstance) Exists(ctx context.Context, w databricks.WorkspaceClient, name string) (bool, error) {`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ type Job struct {`
`30`	`30`	URL string `json:"url,omitempty" bundle:"internal"`
`31`	`31`
`32`	`32`	`jobs.JobSettings`
`33`		- Lifecycle Lifecycle `json:"lifecycle"`
	`33`	+ Lifecycle Lifecycle `json:"lifecycle,omitempty"`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`func (j *Job) UnmarshalJSON(b []byte) error {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type MlflowExperiment struct {`
`29`	`29`	URL string `json:"url,omitempty" bundle:"internal"`
`30`	`30`
`31`	`31`	`ml.Experiment`
`32`		- Lifecycle Lifecycle `json:"lifecycle"`
	`32`	+ Lifecycle Lifecycle `json:"lifecycle,omitempty"`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (s *MlflowExperiment) UnmarshalJSON(b []byte) error {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type MlflowModel struct {`
`29`	`29`	URL string `json:"url,omitempty" bundle:"internal"`
`30`	`30`
`31`	`31`	`ml.CreateModelRequest`
`32`		- Lifecycle Lifecycle `json:"lifecycle"`
	`32`	+ Lifecycle Lifecycle `json:"lifecycle,omitempty"`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (s *MlflowModel) UnmarshalJSON(b []byte) error {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type Pipeline struct {`
`29`	`29`	URL string `json:"url,omitempty" bundle:"internal"`
`30`	`30`
`31`	`31`	`pipelines.CreatePipeline`
`32`		- Lifecycle Lifecycle `json:"lifecycle"`
	`32`	+ Lifecycle Lifecycle `json:"lifecycle,omitempty"`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`func (p *Pipeline) UnmarshalJSON(b []byte) error {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ type QualityMonitor struct {`
`21`	`21`
`22`	`22`	`// This struct defines the creation payload for a monitor.`
`23`	`23`	`catalog.CreateMonitor`
`24`		- Lifecycle Lifecycle `json:"lifecycle"`
	`24`	+ Lifecycle Lifecycle `json:"lifecycle,omitempty"`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`func (s *QualityMonitor) UnmarshalJSON(b []byte) error {`