revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-29 02:02:41 +01:00
Code Issues Releases Wiki Activity

Modernize "mailKey" on AlamnacService

Browse source 
Summary: Ref T13641. Ref T13065. Migrate and drop the onboard "mailKey" column for Almanac Services.

Test Plan: Ran storage migration, got clean report, saw migrated value in mail properties table.

Subscribers: PHID-OPKG-gm6ozazyms6q6i22gyam

Maniphest Tasks: T13641, T13065

Differential Revision: https://secure.phabricator.com/D21629
This commit is contained in:
epriestley 2021-03-16 14:58:36 -07:00
parent 15c0c895a5
commit fadb2bd52b
3 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
resources/sql/autopatches/20210316.almanac.05.service-mailkey.php Normal file
View file

@ -0,0 +1,28 @@
<?php
$service_table = new AlmanacService();
$service_conn = $service_table->establishConnection('w');
$properties_table = new PhabricatorMetaMTAMailProperties();
$conn = $properties_table->establishConnection('w');
$iterator = new LiskRawMigrationIterator(
$service_conn,
$service_table->getTableName());
foreach ($iterator as $row) {
queryfx(
$conn,
'INSERT IGNORE INTO %R
(objectPHID, mailProperties, dateCreated, dateModified)
VALUES
(%s, %s, %d, %d)',
$properties_table,
$row['phid'],
phutil_json_encode(
array(
'mailKey' => $row['mailKey'],
)),
PhabricatorTime::getNow(),
PhabricatorTime::getNow());
}

2
resources/sql/autopatches/20210316.almanac.06.service-dropmailkey.sql Normal file
View file

@ -0,0 +1,2 @@
ALTER TABLE {$NAMESPACE}_almanac.almanac_service
DROP mailKey;

10
src/applications/almanac/storage/AlmanacService.php
View file

@ -14,7 +14,6 @@ final class AlmanacService
protected $name; protected $name;
protected $nameIndex; protected $nameIndex;
protected $mailKey;
protected $viewPolicy; protected $viewPolicy;
protected $editPolicy; protected $editPolicy;
protected $serviceType; protected $serviceType;
@ -49,7 +48,6 @@ final class AlmanacService
self::CONFIG_COLUMN_SCHEMA => array( self::CONFIG_COLUMN_SCHEMA => array(
'name' => 'text128', 'name' => 'text128',
'nameIndex' => 'bytes12', 'nameIndex' => 'bytes12',
'mailKey' => 'bytes20',
'serviceType' => 'text64', 'serviceType' => 'text64',
), ),
self::CONFIG_KEY_SCHEMA => array( self::CONFIG_KEY_SCHEMA => array(
@ -67,8 +65,8 @@ final class AlmanacService
) + parent::getConfiguration(); ) + parent::getConfiguration();
} }
public function generatePHID() { public function getPHIDType() {
return PhabricatorPHID::generateNewPHID(AlmanacServicePHIDType::TYPECONST); return AlmanacServicePHIDType::TYPECONST;
} }
public function save() { public function save() {
@ -76,10 +74,6 @@ final class AlmanacService
$this->nameIndex = PhabricatorHash::digestForIndex($this->getName()); $this->nameIndex = PhabricatorHash::digestForIndex($this->getName());
if (!$this->mailKey) {
$this->mailKey = Filesystem::readRandomCharacters(20);
}
return parent::save(); return parent::save();
} }