FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Render GCE project IAM as additive members by rguliyev · Pull Request #2 · e2b-dev/kops · GitHub

This repository was archived by the owner on Sep 3, 2026. It is now read-only.
/ kops Public archive
forked from kubernetes/kops

Render GCE project IAM as additive members #2

Open
rguliyev wants to merge 2 commits into
base: test/update-gce-terraform-fixtures
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 0 Commits 2 Checks 17 Files changed
Open

Render GCE project IAM as additive members #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b03941e
Render GCE project IAM as additive members
rguliyev Jul 20, 2026
c238b76
Merge remote-tracking branch 'fork/test/update-gce-terraform-fixtures…
rguliyev Jul 20, 2026
File filter

Filter by extension

Filter by extension .go  (2) .tf  (2) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
8 changes: 4 additions & 4 deletions tests/integration/update_cluster/many-addons-gce/kubernetes.tf
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -579,14 +579,14 @@ resource "google_compute_subnetwork" "us-test1-minimal-example-com" {
stack_type = "IPV4_ONLY"
}

resource "google_project_iam_binding" "serviceaccount-control-plane" {
members = [format("serviceAccount:%s", google_service_account.control-plane.email)]
resource "google_project_iam_member" "serviceaccount-control-plane" {
member = format("serviceAccount:%s", google_service_account.control-plane.email)
project = "testproject"
role = "roles/container.serviceAgent"
}

resource "google_project_iam_binding" "serviceaccount-nodes" {
members = [format("serviceAccount:%s", google_service_account.node.email)]
resource "google_project_iam_member" "serviceaccount-nodes" {
member = format("serviceAccount:%s", google_service_account.node.email)
project = "testproject"
role = "roles/compute.viewer"
}
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/update_cluster/minimal_gce_dns-none/kubernetes.tf
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -669,14 +669,14 @@ resource "google_compute_subnetwork" "us-test1-minimal-gce-example-com" {
stack_type = "IPV4_ONLY"
}

resource "google_project_iam_binding" "serviceaccount-control-plane" {
members = [format("serviceAccount:%s", google_service_account.control-plane.email)]
resource "google_project_iam_member" "serviceaccount-control-plane" {
member = format("serviceAccount:%s", google_service_account.control-plane.email)
project = "testproject"
role = "roles/container.serviceAgent"
}

resource "google_project_iam_binding" "serviceaccount-nodes" {
members = [format("serviceAccount:%s", google_service_account.node.email)]
resource "google_project_iam_member" "serviceaccount-nodes" {
member = format("serviceAccount:%s", google_service_account.node.email)
project = "testproject"
role = "roles/compute.viewer"
}
Expand Down
18 changes: 10 additions & 8 deletions upup/pkg/fi/cloudup/gcetasks/projectiambinding.go
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -134,21 +134,23 @@ func (_ *ProjectIAMBinding) RenderGCE(t *gce.GCEAPITarget, a, e, changes *Projec
return nil
}

// terraformProjectIAMBinding is the model for a terraform google_project_iam_binding rule
type terraformProjectIAMBinding struct {
Project string `cty:"project"`
Role string `cty:"role"`
Members []*terraformWriter.Literal `cty:"members"`
// terraformProjectIAMMember is the model for a terraform google_project_iam_member rule.
type terraformProjectIAMMember struct {
Project string `cty:"project"`
Role string `cty:"role"`
Member *terraformWriter.Literal `cty:"member"`
}

func (_ *ProjectIAMBinding) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *ProjectIAMBinding) error {
tf := &terraformProjectIAMBinding{
// Render an additive member to match the API target and avoid owning all
// principals granted the role on the project.
tf := &terraformProjectIAMMember{
Project: fi.ValueOf(e.Project),
Role: fi.ValueOf(e.Role),
Members: []*terraformWriter.Literal{e.MemberServiceAccount.TerraformLink_Member()},
Member: e.MemberServiceAccount.TerraformLink_Member(),
}

return t.RenderResource("google_project_iam_binding", *e.Name, tf)
return t.RenderResource("google_project_iam_member", *e.Name, tf)
}

func patchCRMPolicy(policy *cloudresourcemanager.Policy, wantMember string, wantRole string) bool {
Expand Down
40 changes: 40 additions & 0 deletions upup/pkg/fi/cloudup/gcetasks/projectiambinding_test.go
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,14 @@ package gcetasks

import (
"context"
"os"
"path/filepath"
"strings"
"testing"

gcemock "k8s.io/kops/cloudmock/gce"
"k8s.io/kops/upup/pkg/fi"
"k8s.io/kops/upup/pkg/fi/cloudup/terraform"
)

func TestProjectIAMBinding(t *testing.T) {
Expand Down Expand Up @@ -69,3 +73,39 @@ func TestProjectIAMBinding(t *testing.T) {
checkNoChanges(t, ctx, cloud, allTasks)
}
}

func TestProjectIAMBindingRenderTerraform(t *testing.T) {
outDir := t.TempDir()
cloud := gcemock.InstallMockGCECloud("us-test1", "testproject")
target := terraform.NewTerraformTarget(cloud, "testproject", outDir, nil)
task := &ProjectIAMBinding{
Name: fi.PtrTo("serviceaccount-nodes"),
Project: fi.PtrTo("testproject"),
MemberServiceAccount: &ServiceAccount{
Name: fi.PtrTo("node"),
},
Role: fi.PtrTo("roles/compute.viewer"),
}

if err := task.RenderTerraform(target, nil, task, task); err != nil {
t.Fatalf("RenderTerraform() error: %v", err)
}
if err := target.Finish(nil); err != nil {
t.Fatalf("Finish() error: %v", err)
}

b, err := os.ReadFile(filepath.Join(outDir, "kubernetes.tf"))
if err != nil {
t.Fatalf("reading rendered Terraform: %v", err)
}
rendered := string(b)
if !strings.Contains(rendered, `resource "google_project_iam_member" "serviceaccount-nodes"`) {
t.Errorf("rendered Terraform does not contain google_project_iam_member:\n%s", rendered)
}
if !strings.Contains(rendered, `member = format("serviceAccount:%s", google_service_account.node.email)`) {
t.Errorf("rendered Terraform does not contain the service account member expression:\n%s", rendered)
}
if strings.Contains(rendered, "google_project_iam_binding") || strings.Contains(rendered, "members =") {
t.Errorf("rendered Terraform contains authoritative IAM binding syntax:\n%s", rendered)
}
}
Loading
Back | FazBrowse Home | New Git URL