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

Jump to bottom

refactor(gce): Refactor BasicGoogleDeployHandler to be more readable and testable #6290

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

refactor(gce): Refactor BasicGoogleDeployHandler to be more readable and testable #6290

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c41505a
refactor(gce): return Scheduling object instead ServiceAccount
edgarulg Oct 10, 2024
3dae71a
refactor(gce): split BasicGoogleDeployHandler into small methods and …
edgarulg Oct 10, 2024
0711baf
refactor(gce): write test for BasicGoogleDeployHandler.java
edgarulg Oct 10, 2024
ed87704
refactor(gce): deprecate BasicGoogleDeployHandler.groovy
edgarulg Oct 10, 2024
8b3b535
refactor(gce): check if acceleratorConfig is not null
edgarulg Oct 10, 2024
88fef84
refactor(gce): check if acceleratorConfig is not null
edgarulg Oct 10, 2024
d7ffb94
refactor(gce): check if getUseSourceCapacity is not null
edgarulg Oct 10, 2024
a6be707
Merge branch 'master' into refactor-basic-gce-handler
edgarulg Oct 22, 2024
c623134
chore(gce): fix merge conflicts with master
edgarulg Oct 22, 2024
46e7379
Merge branch 'edgarulg-refactor-basic-gce-handler'
edgarulg Oct 22, 2024
cd35e56
Resolved merge conflicts
edgarulg Oct 23, 2024
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
2 changes: 1 addition & 1 deletion ...ver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtil.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ class GCEUtil {
: []
}

static ServiceAccount buildScheduling(BaseGoogleInstanceDescription description) {
static Scheduling buildScheduling(BaseGoogleInstanceDescription description) {
Copy link
Contributor

Choose a reason for hiding this comment

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

How did this ever work before?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In line: https://github.com/spinnaker/clouddriver/blob/master/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/GCEUtil.groovy#L924
It creates a Scheduling object in runtime. Groovy is flexible enough to allow a different object in runtime and it only pass the object to the InstanceProperties object:
https://github.com/spinnaker/clouddriver/blob/master/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/handlers/BasicGoogleDeployHandler.groovy#L390
https://github.com/spinnaker/clouddriver/blob/master/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/handlers/BasicGoogleDeployHandler.groovy#L428

that is how this works but I don't like it. It's really hard to follow what is going on with groovy. That is why I moved it to java.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK. I suppose in some future we'll change GCEUtil to java too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, that is the plan

def scheduling = new Scheduling()

if (description.preemptible != null) {
Expand Down