Skip to content

upjet bump: remove deprecated OverrideFields from resource configurations #1931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erhancagirici merged 4 commits into from
Dec 1, 2025
Merged

upjet bump: remove deprecated OverrideFields from resource configurations #1931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31462a6
bump upjet to 1e4f37b
erhancagirici Nov 30, 2025
ed0bcfa
remove deprecated OverrideFields from resource configurations
erhancagirici Nov 30, 2025
a7ff182
use Resource.MarkAsRequired instead of deprecated config.MarkAsRequired
erhancagirici Nov 30, 2025
a54cf27
examples: update rds parameter groups to aurora-postresql17
erhancagirici Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions config/cluster/autoscaling/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
})
}

Expand Down
2 changes: 1 addition & 1 deletion config/cluster/cloudwatch/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}
Expand Down
2 changes: 1 addition & 1 deletion config/cluster/cloudwatchlogs/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}
Expand Down
2 changes: 1 addition & 1 deletion config/cluster/iam/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
})
}
8 changes: 0 additions & 8 deletions config/cluster/kafka/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
11 changes: 0 additions & 11 deletions config/cluster/rds/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("-"))
Expand Down
5 changes: 0 additions & 5 deletions config/namespaced/autoscaling/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
})
}
2 changes: 1 addition & 1 deletion config/namespaced/cloudwatch/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}
Expand Down
2 changes: 1 addition & 1 deletion config/namespaced/cloudwatchlogs/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}
Expand Down
2 changes: 1 addition & 1 deletion config/namespaced/iam/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
})
}
8 changes: 0 additions & 8 deletions config/namespaced/kafka/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,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{
Expand Down
11 changes: 0 additions & 11 deletions config/namespaced/rds/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("-"))
Expand Down
4 changes: 2 additions & 2 deletions examples/rds/cluster/v1beta2/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ metadata:
spec:
forProvider:
description: RDS custom cluster parameter group
family: aurora-postgresql16
family: aurora-postgresql17
parameter:
- applyMethod: immediate
name: application_name
Expand All @@ -62,7 +62,7 @@ metadata:
spec:
forProvider:
description: example
family: aurora-postgresql16
family: aurora-postgresql17
parameter:
- applyMethod: immediate
name: application_name
Expand Down
4 changes: 2 additions & 2 deletions examples/rds/namespaced/v1beta1/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ metadata:
spec:
forProvider:
description: RDS custom cluster parameter group
family: aurora-postgresql16
family: aurora-postgresql17
parameter:
- applyMethod: immediate
name: application_name
Expand All @@ -59,7 +59,7 @@ metadata:
spec:
forProvider:
description: example
family: aurora-postgresql16
family: aurora-postgresql17
parameter:
- applyMethod: immediate
name: application_name
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/aws/smithy-go v1.23.0
github.com/crossplane/crossplane-runtime/v2 v2.0.0-20250730220209-c306b1c8b181
github.com/crossplane/crossplane-tools v0.0.0-20250731192036-00d407d8b7ec
github.com/crossplane/upjet/v2 v2.1.1-0.20251105114154-e6784cf618e1
github.com/crossplane/upjet/v2 v2.2.1-0.20251128133821-1e4f37b6b5f8
github.com/go-ini/ini v1.46.0
github.com/google/go-cmp v0.7.0
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.66
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,8 +594,8 @@ github.com/crossplane/crossplane-runtime/v2 v2.0.0-20250730220209-c306b1c8b181 h
github.com/crossplane/crossplane-runtime/v2 v2.0.0-20250730220209-c306b1c8b181/go.mod h1:pkd5UzmE8esaZAApevMutR832GjJ1Qgc5Ngr78ByxrI=
github.com/crossplane/crossplane-tools v0.0.0-20250731192036-00d407d8b7ec h1:+51Et4UW8XrvGne8RAqn9qEIfhoqPXYqIp/kQvpMaAo=
github.com/crossplane/crossplane-tools v0.0.0-20250731192036-00d407d8b7ec/go.mod h1:8etxwmP4cZwJDwen4+PQlnc1tggltAhEfyyigmdHulQ=
github.com/crossplane/upjet/v2 v2.1.1-0.20251105114154-e6784cf618e1 h1:aBL5Qy2ylwwAb2hBFKKBkYGyh5YF/nxT2UW43kmU5IA=
github.com/crossplane/upjet/v2 v2.1.1-0.20251105114154-e6784cf618e1/go.mod h1:jDCqvAFLrVEzqE+pywmQ5u18HbJK5j5Jj4cTQpqOLqY=
github.com/crossplane/upjet/v2 v2.2.1-0.20251128133821-1e4f37b6b5f8 h1:5b+YgFtV7lGygQzIIssdEjU85JfQF1P2cSRU14Ii6BY=
github.com/crossplane/upjet/v2 v2.2.1-0.20251128133821-1e4f37b6b5f8/go.mod h1:jDCqvAFLrVEzqE+pywmQ5u18HbJK5j5Jj4cTQpqOLqY=
github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
github.com/dave/jennifer v1.7.1 h1:B4jJJDHelWcDhlRQxWeo0Npa/pYKBLrirAQoTN45txo=
Expand Down
Loading