gravitational/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport.git synced 2026-10-12 02:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix terraform_autoupdate_version when metadata is non-nil (#57453)

Browse Source 
This PR fixes a couple of bugs happening when the user sets the metadata
on the autoupdate config and version resources. With this PR, we are now
ignoring the namespace and revison.
This commit is contained in:
Hugo Shaka
2025-08-04 19:53:36 +00:00
committed by GitHub
parent 5e5aab93b9
commit 3b9cec8f65
2 changed files with 4 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integrations/terraform/protoc-gen-terraform-autoupdate.yaml
+4 -2
View File
@@ -42,17 +42,19 @@ exclude_fields:
# Metadata (we id resources by name on our side)
- "AutoUpdateConfig.metadata.id"
- "AutoUpdateVersion.metadata.id"
- "AutoUpdateVersion.metadata.namespace"
- "AutoUpdateConfig.metadata.namespace"
- "AutoUpdateVersion.metadata.revision"
- "AutoUpdateConfig.metadata.revision"
# These fields will be marked as Computed: true
computed_fields:
# Metadata
- "AutoUpdateVersion.metadata"
- "AutoUpdateVersion.metadata.name"
- "AutoUpdateVersion.metadata.namespace"
- "AutoUpdateVersion.kind"
- "AutoUpdateConfig.metadata"
- "AutoUpdateConfig.metadata.name"
- "AutoUpdateConfig.metadata.namespace"
- "AutoUpdateConfig.kind"
# These fields will be marked as Required: true
integrations/terraform/tfschema/autoupdate/v1/autoupdate_terraform.go
-180
View File
@@ -83,18 +83,6 @@ func GenSchemaAutoUpdateConfig(ctx context.Context) (github_com_hashicorp_terraf
PlanModifiers: []github_com_hashicorp_terraform_plugin_framework_tfsdk.AttributePlanModifier{github_com_hashicorp_terraform_plugin_framework_tfsdk.RequiresReplace()},
Type: github_com_hashicorp_terraform_plugin_framework_types.StringType,
},
"namespace": {
Computed: true,
Description: "namespace is object namespace. The field should be called \"namespace\" when it returns in Teleport 2.4.",
Optional: true,
PlanModifiers: []github_com_hashicorp_terraform_plugin_framework_tfsdk.AttributePlanModifier{github_com_hashicorp_terraform_plugin_framework_tfsdk.UseStateForUnknown()},
Type: github_com_hashicorp_terraform_plugin_framework_types.StringType,
},
"revision": {
Description: "revision is an opaque identifier which tracks the versions of a resource over time. Clients should ignore and not alter its value but must return the revision in any updates of a resource.",
Optional: true,
Type: github_com_hashicorp_terraform_plugin_framework_types.StringType,
},
}),
Computed: true,
Description: "",
@@ -225,18 +213,6 @@ func GenSchemaAutoUpdateVersion(ctx context.Context) (github_com_hashicorp_terra
PlanModifiers: []github_com_hashicorp_terraform_plugin_framework_tfsdk.AttributePlanModifier{github_com_hashicorp_terraform_plugin_framework_tfsdk.RequiresReplace()},
Type: github_com_hashicorp_terraform_plugin_framework_types.StringType,
},
"namespace": {
Computed: true,
Description: "namespace is object namespace. The field should be called \"namespace\" when it returns in Teleport 2.4.",
Optional: true,
PlanModifiers: []github_com_hashicorp_terraform_plugin_framework_tfsdk.AttributePlanModifier{github_com_hashicorp_terraform_plugin_framework_tfsdk.UseStateForUnknown()},
Type: github_com_hashicorp_terraform_plugin_framework_types.StringType,
},
"revision": {
Description: "revision is an opaque identifier which tracks the versions of a resource over time. Clients should ignore and not alter its value but must return the revision in any updates of a resource.",
Optional: true,
Type: github_com_hashicorp_terraform_plugin_framework_types.StringType,
},
}),
Computed: true,
Description: "",
@@ -382,23 +358,6 @@ func CopyAutoUpdateConfigFromTerraform(_ context.Context, tf github_com_hashicor
}
}
}
{
a, ok := tf.Attrs["namespace"]
if !ok {
diags.Append(attrReadMissingDiag{"AutoUpdateConfig.metadata.namespace"})
} else {
v, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
diags.Append(attrReadConversionFailureDiag{"AutoUpdateConfig.metadata.namespace", "github.com/hashicorp/terraform-plugin-framework/types.String"})
} else {
var t string
if !v.Null && !v.Unknown {
t = string(v.Value)
}
obj.Namespace = t
}
}
}
{
a, ok := tf.Attrs["description"]
if !ok {
@@ -450,23 +409,6 @@ func CopyAutoUpdateConfigFromTerraform(_ context.Context, tf github_com_hashicor
}
CopyFromTimestamp(diags, a, &obj.Expires)
}
{
a, ok := tf.Attrs["revision"]
if !ok {
diags.Append(attrReadMissingDiag{"AutoUpdateConfig.metadata.revision"})
} else {
v, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
diags.Append(attrReadConversionFailureDiag{"AutoUpdateConfig.metadata.revision", "github.com/hashicorp/terraform-plugin-framework/types.String"})
} else {
var t string
if !v.Null && !v.Unknown {
t = string(v.Value)
}
obj.Revision = t
}
}
}
}
}
}
@@ -850,28 +792,6 @@ func CopyAutoUpdateConfigToTerraform(ctx context.Context, obj *github_com_gravit
tf.Attrs["name"] = v
}
}
{
t, ok := tf.AttrTypes["namespace"]
if !ok {
diags.Append(attrWriteMissingDiag{"AutoUpdateConfig.metadata.namespace"})
} else {
v, ok := tf.Attrs["namespace"].(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
i, err := t.ValueFromTerraform(ctx, github_com_hashicorp_terraform_plugin_go_tftypes.NewValue(t.TerraformType(ctx), nil))
if err != nil {
diags.Append(attrWriteGeneralError{"AutoUpdateConfig.metadata.namespace", err})
}
v, ok = i.(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
diags.Append(attrWriteConversionFailureDiag{"AutoUpdateConfig.metadata.namespace", "github.com/hashicorp/terraform-plugin-framework/types.String"})
}
v.Null = string(obj.Namespace) == ""
}
v.Value = string(obj.Namespace)
v.Unknown = false
tf.Attrs["namespace"] = v
}
}
{
t, ok := tf.AttrTypes["description"]
if !ok {
@@ -953,28 +873,6 @@ func CopyAutoUpdateConfigToTerraform(ctx context.Context, obj *github_com_gravit
tf.Attrs["expires"] = v
}
}
{
t, ok := tf.AttrTypes["revision"]
if !ok {
diags.Append(attrWriteMissingDiag{"AutoUpdateConfig.metadata.revision"})
} else {
v, ok := tf.Attrs["revision"].(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
i, err := t.ValueFromTerraform(ctx, github_com_hashicorp_terraform_plugin_go_tftypes.NewValue(t.TerraformType(ctx), nil))
if err != nil {
diags.Append(attrWriteGeneralError{"AutoUpdateConfig.metadata.revision", err})
}
v, ok = i.(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
diags.Append(attrWriteConversionFailureDiag{"AutoUpdateConfig.metadata.revision", "github.com/hashicorp/terraform-plugin-framework/types.String"})
}
v.Null = string(obj.Revision) == ""
}
v.Value = string(obj.Revision)
v.Unknown = false
tf.Attrs["revision"] = v
}
}
}
v.Unknown = false
tf.Attrs["metadata"] = v
@@ -1471,23 +1369,6 @@ func CopyAutoUpdateVersionFromTerraform(_ context.Context, tf github_com_hashico
}
}
}
{
a, ok := tf.Attrs["namespace"]
if !ok {
diags.Append(attrReadMissingDiag{"AutoUpdateVersion.metadata.namespace"})
} else {
v, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
diags.Append(attrReadConversionFailureDiag{"AutoUpdateVersion.metadata.namespace", "github.com/hashicorp/terraform-plugin-framework/types.String"})
} else {
var t string
if !v.Null && !v.Unknown {
t = string(v.Value)
}
obj.Namespace = t
}
}
}
{
a, ok := tf.Attrs["description"]
if !ok {
@@ -1539,23 +1420,6 @@ func CopyAutoUpdateVersionFromTerraform(_ context.Context, tf github_com_hashico
}
CopyFromTimestamp(diags, a, &obj.Expires)
}
{
a, ok := tf.Attrs["revision"]
if !ok {
diags.Append(attrReadMissingDiag{"AutoUpdateVersion.metadata.revision"})
} else {
v, ok := a.(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
diags.Append(attrReadConversionFailureDiag{"AutoUpdateVersion.metadata.revision", "github.com/hashicorp/terraform-plugin-framework/types.String"})
} else {
var t string
if !v.Null && !v.Unknown {
t = string(v.Value)
}
obj.Revision = t
}
}
}
}
}
}
@@ -1824,28 +1688,6 @@ func CopyAutoUpdateVersionToTerraform(ctx context.Context, obj *github_com_gravi
tf.Attrs["name"] = v
}
}
{
t, ok := tf.AttrTypes["namespace"]
if !ok {
diags.Append(attrWriteMissingDiag{"AutoUpdateVersion.metadata.namespace"})
} else {
v, ok := tf.Attrs["namespace"].(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
i, err := t.ValueFromTerraform(ctx, github_com_hashicorp_terraform_plugin_go_tftypes.NewValue(t.TerraformType(ctx), nil))
if err != nil {
diags.Append(attrWriteGeneralError{"AutoUpdateVersion.metadata.namespace", err})
}
v, ok = i.(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
diags.Append(attrWriteConversionFailureDiag{"AutoUpdateVersion.metadata.namespace", "github.com/hashicorp/terraform-plugin-framework/types.String"})
}
v.Null = string(obj.Namespace) == ""
}
v.Value = string(obj.Namespace)
v.Unknown = false
tf.Attrs["namespace"] = v
}
}
{
t, ok := tf.AttrTypes["description"]
if !ok {
@@ -1927,28 +1769,6 @@ func CopyAutoUpdateVersionToTerraform(ctx context.Context, obj *github_com_gravi
tf.Attrs["expires"] = v
}
}
{
t, ok := tf.AttrTypes["revision"]
if !ok {
diags.Append(attrWriteMissingDiag{"AutoUpdateVersion.metadata.revision"})
} else {
v, ok := tf.Attrs["revision"].(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
i, err := t.ValueFromTerraform(ctx, github_com_hashicorp_terraform_plugin_go_tftypes.NewValue(t.TerraformType(ctx), nil))
if err != nil {
diags.Append(attrWriteGeneralError{"AutoUpdateVersion.metadata.revision", err})
}
v, ok = i.(github_com_hashicorp_terraform_plugin_framework_types.String)
if !ok {
diags.Append(attrWriteConversionFailureDiag{"AutoUpdateVersion.metadata.revision", "github.com/hashicorp/terraform-plugin-framework/types.String"})
}
v.Null = string(obj.Revision) == ""
}
v.Value = string(obj.Revision)
v.Unknown = false
tf.Attrs["revision"] = v
}
}
}
v.Unknown = false
tf.Attrs["metadata"] = v