Merge pull request #1931 from erhancagirici/bump-upjet-1e4f37b

upjet bump: remove deprecated OverrideFields from resource configurations

Author: erhancagirici

config/cluster/autoscaling/config.go

@@ -53,11 +53,6 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 		r.References["autoscaling_group_name"] = config.Reference{
 			TerraformName: "aws_autoscaling_group",
 		}
-		r.OverrideFieldNames = map[string]string{
-			"TagParameters":     "GroupTagTagParameters",
-			"TagObservation":    "GroupTagTagObservation",
-			"TagInitParameters": "GroupTagTagInitParameters",
-		}
 	})
 }
 

config/cluster/cloudwatch/config.go

@@ -13,7 +13,7 @@ import (
 // Configure adds configurations for the cloudwatch group.
 func Configure(p *config.Provider) { //nolint:gocyclo
 	p.AddResourceConfigurator("aws_cloudwatch_metric_stream", func(r *config.Resource) {
-		config.MarkAsRequired(r.TerraformResource, "name")
+		r.MarkAsRequired("name")
 		r.LateInitializer = config.LateInitializer{
 			IgnoredFields: []string{"name_prefix"},
 		}

config/cluster/cloudwatchlogs/config.go

@@ -39,7 +39,7 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 	})
 
 	p.AddResourceConfigurator("aws_cloudwatch_log_group", func(r *config.Resource) {
-		config.MarkAsRequired(r.TerraformResource, "name")
+		r.MarkAsRequired("name")
 		r.LateInitializer = config.LateInitializer{
 			IgnoredFields: []string{"name_prefix"},
 		}

config/cluster/iam/config.go

@@ -121,6 +121,6 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 
 	p.AddResourceConfigurator("aws_iam_policy", func(r *config.Resource) {
 		// Otherwise TF assigns a random string.
-		config.MarkAsRequired(r.TerraformResource, "name")
+		r.MarkAsRequired("name")
 	})
 }

config/cluster/kafka/config.go

@@ -248,14 +248,6 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 			RefFieldName:      "SubnetIDRefs",
 			SelectorFieldName: "SubnetIDSelector",
 		}
-		r.OverrideFieldNames = map[string]string{
-			"ClientAuthenticationParameters":     "ServerlessClusterClientAuthenticationParameters",
-			"ClientAuthenticationInitParameters": "ServerlessClusterClientAuthenticationInitParameters",
-			"ClientAuthenticationObservation":    "ServerlessClusterClientAuthenticationObservation",
-			"SaslParameters":                     "ClientAuthenticationSaslParameters",
-			"SaslInitParameters":                 "ClientAuthenticationSaslInitParameters",
-			"SaslObservation":                    "ClientAuthenticationSaslObservation",
-		}
 	})
 	p.AddResourceConfigurator("aws_msk_replicator", func(r *config.Resource) {
 		r.References["kafka_cluster.vpc_config.subnet_ids"] = config.Reference{

config/cluster/rds/config.go

@@ -58,17 +58,6 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 			}
 			return conn, nil
 		}
-		r.OverrideFieldNames = map[string]string{
-			"S3ImportParameters":                 "ClusterS3ImportParameters",
-			"S3ImportInitParameters":             "ClusterS3ImportInitParameters",
-			"S3ImportObservation":                "ClusterS3ImportObservation",
-			"RestoreToPointInTimeParameters":     "ClusterRestoreToPointInTimeParameters",
-			"RestoreToPointInTimeInitParameters": "ClusterRestoreToPointInTimeInitParameters",
-			"RestoreToPointInTimeObservation":    "ClusterRestoreToPointInTimeObservation",
-			"MasterUserSecretParameters":         "ClusterMasterUserSecretParameters",
-			"MasterUserSecretInitParameters":     "ClusterMasterUserSecretInitParameters",
-			"MasterUserSecretObservation":        "ClusterMasterUserSecretObservation",
-		}
 		desc, _ := comments.New("If true, the password will be auto-generated and"+
 			" stored in the Secret referenced by the masterPasswordSecretRef field.",
 			comments.WithTFTag("-"))

config/namespaced/autoscaling/config.go

@@ -42,10 +42,5 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 		r.References["autoscaling_group_name"] = config.Reference{
 			TerraformName: "aws_autoscaling_group",
 		}
-		r.OverrideFieldNames = map[string]string{
-			"TagParameters":     "GroupTagTagParameters",
-			"TagObservation":    "GroupTagTagObservation",
-			"TagInitParameters": "GroupTagTagInitParameters",
-		}
 	})
 }

config/namespaced/cloudwatch/config.go

@@ -13,7 +13,7 @@ import (
 // Configure adds configurations for the cloudwatch group.
 func Configure(p *config.Provider) { //nolint:gocyclo
 	p.AddResourceConfigurator("aws_cloudwatch_metric_stream", func(r *config.Resource) {
-		config.MarkAsRequired(r.TerraformResource, "name")
+		r.MarkAsRequired("name")
 		r.LateInitializer = config.LateInitializer{
 			IgnoredFields: []string{"name_prefix"},
 		}

config/namespaced/cloudwatchlogs/config.go

@@ -39,7 +39,7 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 	})
 
 	p.AddResourceConfigurator("aws_cloudwatch_log_group", func(r *config.Resource) {
-		config.MarkAsRequired(r.TerraformResource, "name")
+		r.MarkAsRequired("name")
 		r.LateInitializer = config.LateInitializer{
 			IgnoredFields: []string{"name_prefix"},
 		}

config/namespaced/iam/config.go

@@ -121,6 +121,6 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 
 	p.AddResourceConfigurator("aws_iam_policy", func(r *config.Resource) {
 		// Otherwise TF assigns a random string.
-		config.MarkAsRequired(r.TerraformResource, "name")
+		r.MarkAsRequired("name")
 	})
 }