vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #205 from coreos-inc/delrobot

Browse source 
Fix deletion of robot accounts when attached to builds
This commit is contained in:
Jimmy Zelinskie 2015-07-13 12:19:01 -04:00
commit bde781c98b
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/database.py
View file

@ -200,7 +200,7 @@ class User(BaseModel):
# If we are deleting a robot account, only execute the subset of queries necessary. # If we are deleting a robot account, only execute the subset of queries necessary.
if self.robot: if self.robot:
# For all the model dependencies, only delete those that allow robots. # For all the model dependencies, only delete those that allow robots.
for query, fk in self.dependencies(search_nullable=True): for query, fk in reversed(list(self.dependencies(search_nullable=True))):
if isinstance(fk, QuayUserField) and fk.allows_robots: if isinstance(fk, QuayUserField) and fk.allows_robots:
model = fk.model_class model = fk.model_class
@ -395,7 +395,8 @@ class RepositoryBuildTrigger(BaseModel):
private_key = TextField(null=True) private_key = TextField(null=True)
config = TextField(default='{}') config = TextField(default='{}')
write_token = ForeignKeyField(AccessToken, null=True) write_token = ForeignKeyField(AccessToken, null=True)
pull_robot = QuayUserField(allows_robots=True, null=True, related_name='triggerpullrobot') pull_robot = QuayUserField(allows_robots=True, null=True, related_name='triggerpullrobot',
robot_null_delete=True)
class EmailConfirmation(BaseModel): class EmailConfirmation(BaseModel):
@ -545,7 +546,8 @@ class RepositoryBuild(BaseModel):
started = DateTimeField(default=datetime.now) started = DateTimeField(default=datetime.now)
display_name = CharField() display_name = CharField()
trigger = ForeignKeyField(RepositoryBuildTrigger, null=True, index=True) trigger = ForeignKeyField(RepositoryBuildTrigger, null=True, index=True)
pull_robot = QuayUserField(null=True, related_name='buildpullrobot') pull_robot = QuayUserField(null=True, related_name='buildpullrobot', allows_robots=True,
robot_null_delete=True)
logs_archived = BooleanField(default=False) logs_archived = BooleanField(default=False)
queue_id = CharField(null=True, index=True) queue_id = CharField(null=True, index=True)

12
test/test_api_usage.py
View file

@ -2356,7 +2356,14 @@ class TestOrgRobots(ApiTestCase):
repo = model.get_repository(ORGANIZATION, ORG_REPO) repo = model.get_repository(ORGANIZATION, ORG_REPO)
user = model.get_user(ADMIN_ACCESS_USER) user = model.get_user(ADMIN_ACCESS_USER)
pull_robot = model.get_user(membername) pull_robot = model.get_user(membername)
model.create_build_trigger(repo, 'fakeservice', 'sometoken', user, pull_robot=pull_robot) trigger = model.create_build_trigger(repo, 'fakeservice', 'sometoken', user, pull_robot=pull_robot)
# Add a fake build of the fake build trigger.
token = model.create_access_token(repo, 'write', kind='build-worker',
friendly_name='Repository Build Token')
build = model.create_repository_build(repo, token, {}, 'fake-dockerfile', 'fake-name', trigger,
pull_robot_name=membername)
# Add some log entries for the robot. # Add some log entries for the robot.
model.log_action('pull_repo', ORGANIZATION, performer=pull_robot, repository=repo) model.log_action('pull_repo', ORGANIZATION, performer=pull_robot, repository=repo)
@ -2365,6 +2372,9 @@ class TestOrgRobots(ApiTestCase):
self.deleteResponse(OrgRobot, self.deleteResponse(OrgRobot,
params=dict(orgname=ORGANIZATION, robot_shortname='bender')) params=dict(orgname=ORGANIZATION, robot_shortname='bender'))
# Verify the build is still present.
self.assertIsNotNone(model.get_repository_build(build.uuid))
# All the above records should now be deleted, along with the robot. We verify a few of the # All the above records should now be deleted, along with the robot. We verify a few of the
# critical ones below. # critical ones below.