Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c140fdfb
Commit
c140fdfb
authored
Feb 23, 2022
by
Tiffany Rea
Committed by
Dan Davison
Feb 23, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle possible nil errors in delete resources job
parent
98fa61ef
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
8 deletions
+14
-8
qa/qa/tools/delete_test_resources.rb
qa/qa/tools/delete_test_resources.rb
+14
-8
No files found.
qa/qa/tools/delete_test_resources.rb
View file @
c140fdfb
...
@@ -32,6 +32,8 @@ module QA
...
@@ -32,6 +32,8 @@ module QA
def
run
def
run
failures
=
files
.
flat_map
do
|
file
|
failures
=
files
.
flat_map
do
|
file
|
resources
=
read_file
(
file
)
resources
=
read_file
(
file
)
next
if
resources
.
nil?
filtered_resources
=
filter_resources
(
resources
)
filtered_resources
=
filter_resources
(
resources
)
delete_resources
(
filtered_resources
)
delete_resources
(
filtered_resources
)
end
end
...
@@ -45,21 +47,24 @@ module QA
...
@@ -45,21 +47,24 @@ module QA
private
private
def
files
def
files
puts
"Gathering JSON files...
\n
"
Runtime
::
Logger
.
info
(
'Gathering JSON files...'
)
files
=
Dir
.
glob
(
@file_pattern
)
files
=
Dir
.
glob
(
@file_pattern
)
abort
(
"There is no file with this pattern
#{
@file_pattern
}
"
)
if
files
.
empty?
abort
(
"There is no file with this pattern
#{
@file_pattern
}
"
)
if
files
.
empty?
files
.
reject
{
|
file
|
File
.
zero?
(
file
)
}
files
.
reject
!
{
|
file
|
File
.
zero?
(
file
)
}
files
files
end
end
def
read_file
(
file
)
def
read_file
(
file
)
JSON
.
parse
(
File
.
read
(
file
))
JSON
.
parse
(
File
.
read
(
file
))
rescue
JSON
::
ParserError
Runtime
::
Logger
.
error
(
"Failed to read
#{
file
}
- Invalid format"
)
nil
end
end
def
filter_resources
(
resources
)
def
filter_resources
(
resources
)
puts
"Filtering resources - Only keep deletable resources...
\n
"
Runtime
::
Logger
.
info
(
'Filtering resources - Only keep deletable resources...'
)
transformed_values
=
resources
.
transform_values!
do
|
v
|
transformed_values
=
resources
.
transform_values!
do
|
v
|
v
.
reject
do
|
attributes
|
v
.
reject
do
|
attributes
|
...
@@ -73,19 +78,20 @@ module QA
...
@@ -73,19 +78,20 @@ module QA
end
end
def
delete_resources
(
resources
)
def
delete_resources
(
resources
)
Runtime
::
Logger
.
info
(
'Nothing to delete.'
)
&&
return
if
resources
.
nil?
resources
.
each_with_object
([])
do
|
(
key
,
value
),
failures
|
resources
.
each_with_object
([])
do
|
(
key
,
value
),
failures
|
value
.
each
do
|
resource
|
value
.
each
do
|
resource
|
next
if
resource_not_found?
(
resource
[
'api_path'
])
next
if
resource_not_found?
(
resource
[
'api_path'
])
msg
=
resource
[
'info'
]
?
"
#{
key
}
-
#{
resource
[
'info'
]
}
"
:
"
#{
key
}
at
#{
resource
[
'api_path'
]
}
"
resource_info
=
resource
[
'info'
]
?
"
#{
key
}
-
#{
resource
[
'info'
]
}
"
:
"
#{
key
}
at
#{
resource
[
'api_path'
]
}
"
puts
"
\n
Deleting
#{
msg
}
..."
delete_response
=
delete
(
Runtime
::
API
::
Request
.
new
(
@api_client
,
resource
[
'api_path'
]).
url
)
delete_response
=
delete
(
Runtime
::
API
::
Request
.
new
(
@api_client
,
resource
[
'api_path'
]).
url
)
if
delete_response
.
code
==
202
||
delete_response
.
code
==
204
if
delete_response
.
code
==
202
||
delete_response
.
code
==
204
print
"
\e
[32m.
\e
[0m"
Runtime
::
Logger
.
info
(
"Deleting
#{
resource_info
}
... SUCCESS"
)
else
else
print
"
\e
[31mF
\e
[0m"
Runtime
::
Logger
.
info
(
"Deleting
#{
resource_info
}
... FAILED"
)
failures
<<
msg
failures
<<
resource_info
end
end
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment