Skip to content

resourceIdentityGeneration: use nil check instead of error when calling identity() #10804

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
modular-magician merged 1 commit into from
Sep 27, 2025
Merged

resourceIdentityGeneration: use nil check instead of error when calling identity() #10804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 8 additions & 7 deletions google-beta/services/accessapproval/resource_folder_access_approval_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,14 +341,15 @@ func resourceAccessApprovalFolderSettingsRead(d *schema.ResourceData, meta inter
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
if v, ok := identity.GetOk("folder_id"); ok && v != "" {
err = identity.Set("folder_id", d.Get("folder_id").(string))
if err != nil {
return fmt.Errorf("Error setting folder_id: %s", err)
if err != nil && identity != nil {
if v, ok := identity.GetOk("folder_id"); ok && v != "" {
err = identity.Set("folder_id", d.Get("folder_id").(string))
if err != nil {
return fmt.Errorf("Error setting folder_id: %s", err)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
15 changes: 8 additions & 7 deletions google-beta/services/accessapproval/resource_organization_access_approval_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,14 +301,15 @@ func resourceAccessApprovalOrganizationSettingsRead(d *schema.ResourceData, meta
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
if v, ok := identity.GetOk("organization_id"); ok && v != "" {
err = identity.Set("organization_id", d.Get("organization_id").(string))
if err != nil {
return fmt.Errorf("Error setting organization_id: %s", err)
if err != nil && identity != nil {
if v, ok := identity.GetOk("organization_id"); ok && v != "" {
err = identity.Set("organization_id", d.Get("organization_id").(string))
if err != nil {
return fmt.Errorf("Error setting organization_id: %s", err)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
15 changes: 8 additions & 7 deletions google-beta/services/accessapproval/resource_project_access_approval_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,15 @@ func resourceAccessApprovalProjectSettingsRead(d *schema.ResourceData, meta inte
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
if v, ok := identity.GetOk("project_id"); ok && v != "" {
err = identity.Set("project_id", d.Get("project_id").(string))
if err != nil {
return fmt.Errorf("Error setting project_id: %s", err)
if err != nil && identity != nil {
if v, ok := identity.GetOk("project_id"); ok && v != "" {
err = identity.Set("project_id", d.Get("project_id").(string))
if err != nil {
return fmt.Errorf("Error setting project_id: %s", err)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
15 changes: 8 additions & 7 deletions google-beta/services/accesscontextmanager/resource_access_context_manager_access_level.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,15 @@ func resourceAccessContextManagerAccessLevelRead(d *schema.ResourceData, meta in
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
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 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)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
15 changes: 8 additions & 7 deletions ...a/services/accesscontextmanager/resource_access_context_manager_access_level_condition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,14 +485,15 @@ func resourceAccessContextManagerAccessLevelConditionRead(d *schema.ResourceData
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
if v, ok := identity.GetOk("access_level"); ok && v != "" {
err = identity.Set("access_level", d.Get("access_level").(string))
if err != nil {
return fmt.Errorf("Error setting access_level: %s", err)
if err != nil && identity != nil {
if v, ok := identity.GetOk("access_level"); ok && v != "" {
err = identity.Set("access_level", d.Get("access_level").(string))
if err != nil {
return fmt.Errorf("Error setting access_level: %s", err)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
15 changes: 8 additions & 7 deletions google-beta/services/accesscontextmanager/resource_access_context_manager_access_levels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,14 +453,15 @@ func resourceAccessContextManagerAccessLevelsRead(d *schema.ResourceData, meta i
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
if v, ok := identity.GetOk("parent"); ok && v != "" {
err = identity.Set("parent", d.Get("parent").(string))
if err != nil {
return fmt.Errorf("Error setting parent: %s", err)
if err != nil && identity != nil {
if v, ok := identity.GetOk("parent"); ok && v != "" {
err = identity.Set("parent", d.Get("parent").(string))
if err != nil {
return fmt.Errorf("Error setting parent: %s", err)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
15 changes: 8 additions & 7 deletions google-beta/services/accesscontextmanager/resource_access_context_manager_access_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,14 +255,15 @@ func resourceAccessContextManagerAccessPolicyRead(d *schema.ResourceData, meta i
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
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 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)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
15 changes: 8 additions & 7 deletions ...eta/services/accesscontextmanager/resource_access_context_manager_authorized_orgs_desc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,14 +310,15 @@ func resourceAccessContextManagerAuthorizedOrgsDescRead(d *schema.ResourceData,
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
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 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)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
25 changes: 13 additions & 12 deletions google-beta/services/accesscontextmanager/resource_access_context_manager_egress_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,20 +222,21 @@ func resourceAccessContextManagerEgressPolicyRead(d *schema.ResourceData, meta i
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
if v, ok := identity.GetOk("resource"); ok && v != "" {
err = identity.Set("resource", d.Get("resource").(string))
if err != nil {
return fmt.Errorf("Error setting resource: %s", err)
if err != nil && identity != nil {
if v, ok := identity.GetOk("resource"); ok && v != "" {
err = identity.Set("resource", d.Get("resource").(string))
if err != nil {
return fmt.Errorf("Error setting resource: %s", err)
}
}
}
if v, ok := identity.GetOk("egress_policy_name"); ok && v != "" {
err = identity.Set("egress_policy_name", d.Get("egress_policy_name").(string))
if err != nil {
return fmt.Errorf("Error setting egress_policy_name: %s", err)
if v, ok := identity.GetOk("egress_policy_name"); ok && v != "" {
err = identity.Set("egress_policy_name", d.Get("egress_policy_name").(string))
if err != nil {
return fmt.Errorf("Error setting egress_policy_name: %s", err)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
15 changes: 8 additions & 7 deletions .../services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,14 +400,15 @@ func resourceAccessContextManagerGcpUserAccessBindingRead(d *schema.ResourceData
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
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 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)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
25 changes: 13 additions & 12 deletions google-beta/services/accesscontextmanager/resource_access_context_manager_ingress_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,20 +222,21 @@ func resourceAccessContextManagerIngressPolicyRead(d *schema.ResourceData, meta
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
if v, ok := identity.GetOk("resource"); ok && v != "" {
err = identity.Set("resource", d.Get("resource").(string))
if err != nil {
return fmt.Errorf("Error setting resource: %s", err)
if err != nil && identity != nil {
if v, ok := identity.GetOk("resource"); ok && v != "" {
err = identity.Set("resource", d.Get("resource").(string))
if err != nil {
return fmt.Errorf("Error setting resource: %s", err)
}
}
}
if v, ok := identity.GetOk("ingress_policy_name"); ok && v != "" {
err = identity.Set("ingress_policy_name", d.Get("ingress_policy_name").(string))
if err != nil {
return fmt.Errorf("Error setting ingress_policy_name: %s", err)
if v, ok := identity.GetOk("ingress_policy_name"); ok && v != "" {
err = identity.Set("ingress_policy_name", d.Get("ingress_policy_name").(string))
if err != nil {
return fmt.Errorf("Error setting ingress_policy_name: %s", err)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
17 changes: 9 additions & 8 deletions ...e-beta/services/accesscontextmanager/resource_access_context_manager_service_perimeter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,14 +1234,15 @@ func resourceAccessContextManagerServicePerimeterRead(d *schema.ResourceData, me
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
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 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)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
15 changes: 8 additions & 7 deletions ...contextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,14 +519,15 @@ func resourceAccessContextManagerServicePerimeterDryRunEgressPolicyRead(d *schem
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
if v, ok := identity.GetOk("perimeter"); ok && v != "" {
err = identity.Set("perimeter", d.Get("perimeter").(string))
if err != nil {
return fmt.Errorf("Error setting perimeter: %s", err)
if err != nil && identity != nil {
if v, ok := identity.GetOk("perimeter"); ok && v != "" {
err = identity.Set("perimeter", d.Get("perimeter").(string))
if err != nil {
return fmt.Errorf("Error setting perimeter: %s", err)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
15 changes: 8 additions & 7 deletions ...ontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,14 +512,15 @@ func resourceAccessContextManagerServicePerimeterDryRunIngressPolicyRead(d *sche
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
if v, ok := identity.GetOk("perimeter"); ok && v != "" {
err = identity.Set("perimeter", d.Get("perimeter").(string))
if err != nil {
return fmt.Errorf("Error setting perimeter: %s", err)
if err != nil && identity != nil {
if v, ok := identity.GetOk("perimeter"); ok && v != "" {
err = identity.Set("perimeter", d.Get("perimeter").(string))
if err != nil {
return fmt.Errorf("Error setting perimeter: %s", err)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
25 changes: 13 additions & 12 deletions ...ccesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,20 +252,21 @@ func resourceAccessContextManagerServicePerimeterDryRunResourceRead(d *schema.Re
}

identity, err := d.Identity()
if err != nil {
return fmt.Errorf("Error getting identity: %s", err)
}
if v, ok := identity.GetOk("resource"); ok && v != "" {
err = identity.Set("resource", d.Get("resource").(string))
if err != nil {
return fmt.Errorf("Error setting resource: %s", err)
if err != nil && identity != nil {
if v, ok := identity.GetOk("resource"); ok && v != "" {
err = identity.Set("resource", d.Get("resource").(string))
if err != nil {
return fmt.Errorf("Error setting resource: %s", err)
}
}
}
if v, ok := identity.GetOk("perimeter_name"); ok && v != "" {
err = identity.Set("perimeter_name", d.Get("perimeter_name").(string))
if err != nil {
return fmt.Errorf("Error setting perimeter_name: %s", err)
if v, ok := identity.GetOk("perimeter_name"); ok && v != "" {
err = identity.Set("perimeter_name", d.Get("perimeter_name").(string))
if err != nil {
return fmt.Errorf("Error setting perimeter_name: %s", err)
}
}
} else {
fmt.Printf("[DEBUG] identity not set: %s", err)
}
return nil
}
Expand Down
Loading