Skip to content
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

Add CurrentDropletGUID attribute to application resource [main] #3354

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+19 −3
Open

Add CurrentDropletGUID attribute to application resource [main] #3354

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
a84c483
add current_droplet relationships to application resource
gmllt Jun 28, 2024
0f9f273
Merge branch 'main' into add-current-droplet-relationships-for-apps-main
joaopapereira Jan 21, 2025
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
3 changes: 3 additions & 0 deletions api/cloudcontroller/ccv3/constant/relationships.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ const (

// RelationshipTypeQuota is a relationship with a Cloud Controller quota (org quota or space quota).
RelationshipTypeQuota RelationshipType = "quota"

// RelationshipTypeCurrentDroplet is a relationship with a Droplet.
RelationshipTypeCurrentDroplet RelationshipType = "current_droplet"
)
19 changes: 16 additions & 3 deletions resources/application_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ type Application struct {
State constant.ApplicationState
// Credentials are used by Cloud Native Buildpacks lifecycle to pull buildpacks
Credentials map[string]interface{}
// CurrentDropletGUID is the unique identifier of the droplet currently attached to the application.
CurrentDropletGUID string
}

// ApplicationNameOnly represents only the name field of a Cloud Controller V3 Application
Expand All @@ -42,10 +44,18 @@ func (a Application) MarshalJSON() ([]byte, error) {
Metadata: a.Metadata,
}

relationShips := Relationships{}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
relationShips := Relationships{}
relationships := Relationships{}


if a.SpaceGUID != "" {
ccApp.Relationships = Relationships{
constant.RelationshipTypeSpace: Relationship{GUID: a.SpaceGUID},
}
relationShips[constant.RelationshipTypeSpace] = Relationship{GUID: a.SpaceGUID}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
relationShips[constant.RelationshipTypeSpace] = Relationship{GUID: a.SpaceGUID}
relationships[constant.RelationshipTypeSpace] = Relationship{GUID: a.SpaceGUID}

}

if a.CurrentDropletGUID != "" {
relationShips[constant.RelationshipTypeCurrentDroplet] = Relationship{GUID: a.CurrentDropletGUID}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
relationShips[constant.RelationshipTypeCurrentDroplet] = Relationship{GUID: a.CurrentDropletGUID}
relationships[constant.RelationshipTypeCurrentDroplet] = Relationship{GUID: a.CurrentDropletGUID}

}

if len(relationShips) > 0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need this if statement here? if we could I would prefer to have it removed and always set relationships in the struct

ccApp.Relationships = relationShips
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ccApp.Relationships = relationShips
ccApp.Relationships = relationships

}

if a.LifecycleType == constant.AppLifecycleTypeDocker {
Expand Down Expand Up @@ -81,6 +91,9 @@ func (a *Application) UnmarshalJSON(data []byte) error {
a.LifecycleType = lifecycle.Type
a.Name = ccApp.Name
a.SpaceGUID = ccApp.Relationships[constant.RelationshipTypeSpace].GUID
if _, ok := ccApp.Relationships[constant.RelationshipTypeCurrentDroplet]; ok {
a.CurrentDropletGUID = ccApp.Relationships[constant.RelationshipTypeCurrentDroplet].GUID
}
a.State = ccApp.State
a.Metadata = ccApp.Metadata

Expand Down
Loading