Skip to content

Commit 3f41e69

Browse files
committed
reuse same field
Signed-off-by: Jose I. Paris <jiparis@chainloop.dev>
1 parent 7a692df commit 3f41e69

6 files changed

Lines changed: 144 additions & 197 deletions

File tree

app/controlplane/api/controlplane/v1/project.pb.go

Lines changed: 141 additions & 154 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/controlplane/api/controlplane/v1/project.proto

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,8 @@ message ProjectMember {
6868
google.protobuf.Timestamp updated_at = 5;
6969
// The ID of latest project version this member is associated with
7070
string latest_project_version_id = 6;
71-
// Optional parent membership ID for nested project memberships
72-
optional string parent_id = 7;
7371
// Optional parent resource ID for nested project memberships
74-
optional string parent_resource_id = 8;
72+
optional string parent_id = 7;
7573
}
7674

7775
// ProjectServiceAddMemberRequest contains the information needed to add a user to a project

app/controlplane/api/gen/frontend/controlplane/v1/project.ts

Lines changed: 1 addition & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/controlplane/api/gen/jsonschema/controlplane.v1.ProjectMember.jsonschema.json

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/controlplane/api/gen/jsonschema/controlplane.v1.ProjectMember.schema.json

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/controlplane/internal/service/project.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,8 @@ func bizProjectMembershipToPb(m *biz.ProjectMembership) *pb.ProjectMember {
388388
Role: role,
389389
}
390390

391-
if m.ParentID != nil {
392-
pbMember.ParentId = biz.ToPtr(m.ParentID.String())
393-
}
394-
395391
if m.ParentResourceID != nil {
396-
pbMember.ParentResourceId = biz.ToPtr(m.ParentResourceID.String())
392+
pbMember.ParentId = biz.ToPtr(m.ParentResourceID.String())
397393
}
398394

399395
if m.User != nil {

0 commit comments

Comments
 (0)