Page MenuHomePhabricator
Files F15402918

D14368.id34695.diff
No OneTemporary
Actions

D14368.id34695.diff
View Options

diff --git a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
--- a/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
+++ b/src/applications/drydock/worker/DrydockLeaseUpdateWorker.php
@@ -309,17 +309,18 @@
return array();
}
- $query = id(new DrydockBlueprintQuery())
- ->setViewer($viewer)
- ->withBlueprintClasses(array_keys($impls))
- ->withDisabled(false);
-
$blueprint_phids = $lease->getAllowedBlueprintPHIDs();
if (!$blueprint_phids) {
$lease->logEvent(DrydockLeaseNoBlueprintsLogType::LOGCONST);
return array();
}
+ $query = id(new DrydockBlueprintQuery())
+ ->setViewer($viewer)
+ ->withPHIDs($blueprint_phids)
+ ->withBlueprintClasses(array_keys($impls))
+ ->withDisabled(false);
+
// The Drydock application itself is allowed to authorize anything. This
// is primarily used for leases generated by CLI administrative tools.
$drydock_phid = id(new PhabricatorDrydockApplication())->getPHID();
diff --git a/src/applications/harbormaster/step/HarbormasterLeaseWorkingCopyBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterLeaseWorkingCopyBuildStepImplementation.php
--- a/src/applications/harbormaster/step/HarbormasterLeaseWorkingCopyBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterLeaseWorkingCopyBuildStepImplementation.php
@@ -41,7 +41,10 @@
$working_copy_type = id(new DrydockWorkingCopyBlueprintImplementation())
->getType();
- $allowed_phids = $build_target->getFieldValue('repositoryPHIDs');
+ $allowed_phids = $build_target->getFieldValue('blueprintPHIDs');
+ if (!is_array($allowed_phids)) {
+ $allowed_phids = array();
+ }
$authorizing_phid = $build_target->getBuildStep()->getPHID();
$lease = DrydockLease::initializeNewLease()

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 19, 1:02 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7225436
Default Alt Text
D14368.id34695.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility