Skip to content

resourceIdentity: block Identity() support from resources that exclude_read #16058

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
BBBmau merged 3 commits into from
Jan 8, 2026
+29 −3
Merged

resourceIdentity: block Identity() support from resources that exclude_read #16058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c306103
use default identity + add identity call in custom_create
BBBmau Jan 2, 2026
b8cd625
prevent identity support on resources that exclude_read
BBBmau Jan 2, 2026
c38ed4a
add explicit identity() in custom_update for colab_runtime
BBBmau Jan 6, 2026
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
24 changes: 24 additions & 0 deletions mmv1/templates/terraform/custom_update/colab_runtime.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,30 @@ if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
billingProject = bp
}

identity, err := d.Identity()
if err == nil && identity != nil {
if v, ok := identity.GetOk("name"); !ok && v == "" {
err = identity.Set("name", d.Get("name").(string))
if err != nil {
return fmt.Errorf("Error setting name: %s", err)
}
}
if v, ok := identity.GetOk("project"); !ok && v == "" {
err = identity.Set("project", d.Get("project").(string))
if err != nil {
return fmt.Errorf("Error setting project: %s", err)
}
}
if v, ok := identity.GetOk("location"); !ok && v == "" {
err = identity.Set("location", d.Get("location").(string))
if err != nil {
return fmt.Errorf("Error setting location: %s", err)
}
}
} else {
log.Printf("[DEBUG] (Read) identity not set: %s", err)
}

if desired_state != "" && state != desired_state {
var verb string

Expand Down
8 changes: 5 additions & 3 deletions mmv1/templates/terraform/resource.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ func Resource{{ $.ResourceName -}}() *schema.Resource {
DeprecationMessage: "{{ $.DeprecationMessage -}}",
{{- end}}

{{ if not $.ExcludeRead }}
Identity: &schema.ResourceIdentity{
Version: {{ $.GetIdentitySchemaVersion }},
SchemaFunc: func() map[string]*schema.Schema {
Expand Down Expand Up @@ -191,6 +192,7 @@ func Resource{{ $.ResourceName -}}() *schema.Resource {
},
{{- end }}
},
{{- end }}
Schema: map[string]*schema.Schema{
{{- range $prop := $.OrderProperties $.AllUserProperties }}
{{template "SchemaFields" $prop -}}
Expand Down Expand Up @@ -745,7 +747,7 @@ func resource{{ $.ResourceName -}}Read(d *schema.ResourceData, meta interface{})
return fmt.Errorf("Error reading {{ $.Name -}}: %s", err)
}
{{- end}}

{{ if not $.ExcludeRead }}
identity, err := d.Identity()
if err != nil && identity != nil {
{{- range $p := $.IdentityProperties }}
Expand All @@ -759,6 +761,7 @@ func resource{{ $.ResourceName -}}Read(d *schema.ResourceData, meta interface{})
} else {
log.Printf("[DEBUG] identity not set: %s", err)
}
{{ end }}
{{- end }}
return nil
}
Expand Down Expand Up @@ -1296,8 +1299,7 @@ func resource{{ $.ResourceName -}}PostCreateFailure(d *schema.ResourceData, meta
{{ customTemplate $ $.StateMigrationFile false -}}
{{- end }}

{{- if and $.IdentitySchemaVersion $.IdentityUpgraders }}

{{- if and (and $.IdentitySchemaVersion $.IdentityUpgraders) (not $.ExcludeRead) }}
{{ $.CustomTemplate $.IdentityUpgraderFile false -}}
{{- end }}

Expand Down
Loading