Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
1105 Внедрение механизмов обеспечения безопасности цепочки поставки программных проектов
Legacy
scanned-projects
helm
Commits
538e8297
Commit
538e8297
authored
8 years ago
by
Michelle Noorali
Browse files
Options
Download
Patches
Plain Diff
ref(*): add namespace info to failing test msg
* also cleanup comments
parent
bf9ae52e
main
Release
add-codeql
dependabot/go_modules/github.com/docker/distribution-2.8.2incompatible
dependabot/go_modules/github.com/lib/pq-1.10.9
dependabot/go_modules/github.com/rubenv/sql-migrate-1.4.0
dependabot/go_modules/golang.org/x/crypto-0.9.0
dependabot/go_modules/golang.org/x/term-0.8.0
dependabot/go_modules/k8s.io/klog/v2-2.100.1
dev-v2
feat-v3/event-emitter-lua
release-2.10
release-2.11
release-2.12
release-2.13
release-2.14
release-2.15
release-2.16
release-2.17
release-2.2
release-2.3
release-2.4
release-2.5
release-2.6
release-2.7
release-2.8
release-2.9
release-3.0
release-3.1
release-3.10
release-3.11
release-3.12
release-3.2
release-3.3
release-3.4
release-3.5
release-3.6
release-3.6.1
release-3.6.2
release-3.7
release-3.8
release-3.9
release-v3.0.0-beta.4
v3.12.0
v3.12.0-rc.1
v3.12.0-dev.1
v3.11.3
v3.11.2
v3.11.1
v3.11.0
v3.11.0-rc.2
v3.11.0-rc.1
v3.10.3
v3.10.2
v3.10.1
v3.10.0
v3.10.0-rc.1
v3.9.4
v3.9.3
v3.9.2
v3.9.1
v3.9.0
v3.9.0-rc.1
v3.8.2
v3.8.1
v3.8.0
v3.8.0-rc.2
v3.8.0-rc.1
v3.7.2
v3.7.1
v3.7.0
v3.7.0-rc.3
v3.7.0-rc.2
v3.7.0-rc.1
v3.6.3
v3.6.2
v3.6.1
v3.6.0
v3.6.0-rc.1
v3.5.4
v3.5.3
v3.5.2
v3.5.1
v3.5.0
v3.5.0-rc.2
v3.5.0-rc.1
v3.4.2
v3.4.1
v3.4.0
v3.4.0-rc.1
v3.3.4
v3.3.3
v3.3.2
v3.3.1
v3.3.0
v3.3.0-rc.2
v3.3.0-rc.1
v3.2.4
v3.2.3
v3.2.2
v3.2.1
v3.2.0
v3.2.0-rc.1
v3.1.3
v3.1.2
v3.1.1
v3.1.0
v3.1.0-rc.3
v3.1.0-rc.2
v3.1.0-rc.1
v3.0.3
v3.0.2
v3.0.1
v3.0.0
v3.0.0-rc.4
v3.0.0-rc.3
v3.0.0-rc.2
v3.0.0-rc.1
v3.0.0-beta.5
v3.0.0-beta.4
v3.0.0-beta.3
v3.0.0-beta.2
v3.0.0-beta.1
v3.0.0-alpha.2
v3.0.0-alpha.1
v2.17.0
v2.17.0-rc.1
v2.16.12
v2.16.11
v2.16.10
v2.16.9
v2.16.8
v2.16.7
v2.16.6
v2.16.5
v2.16.4
v2.16.3
v2.16.2
v2.16.1
v2.16.0
v2.16.0-rc.2
v2.16.0-rc.1
v2.15.2
v2.15.1
v2.15.0
v2.15.0-rc.2
v2.15.0-rc.1
v2.14.3
v2.14.2
v2.14.1
v2.14.0
v2.14.0-rc.2
v2.14.0-rc.1
v2.13.1
v2.13.1-rc.1
v2.13.0
v2.13.0-rc.2
v2.13.0-rc.1
v2.12.3
v2.12.2
v2.12.1
v2.12.0
v2.12.0-rc.2
v2.12.0-rc.1
v2.11.0
v2.11.0-rc.4
v2.11.0-rc.3
v2.11.0-rc.2
v2.11.0-rc.1
v2.10.0
v2.10.0-rc.3
v2.10.0-rc.2
v2.10.0-rc.1
v2.9.1
v2.9.0
v2.9.0-rc5
v2.9.0-rc4
v2.9.0-rc3
v2.9.0-rc2
v2.9.0-rc1
v2.8.2
v2.8.2-rc1
v2.8.1
v2.8.0
v2.8.0-rc.1
v2.7.2
v2.7.1
v2.7.0
v2.7.0-rc1
v2.6.2
v2.6.1
v2.6.0
v2.5.1
v2.5.0
v2.4.2
v2.4.1
v2.4.0
v2.3.1
v2.3.0
v2.2.3
v2.2.2
v2.2.1
v2.2.0
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
_proto/hapi/services/tiller.proto
+2
-4
_proto/hapi/services/tiller.proto
cmd/helm/release_testing.go
+1
-1
cmd/helm/release_testing.go
pkg/releasetesting/environment.go
+2
-2
pkg/releasetesting/environment.go
pkg/releasetesting/test_suite.go
+2
-2
pkg/releasetesting/test_suite.go
pkg/releasetesting/test_suite_test.go
+1
-1
pkg/releasetesting/test_suite_test.go
pkg/tiller/release_server_test.go
+1
-1
pkg/tiller/release_server_test.go
with
9 additions
and
11 deletions
+9
-11
_proto/hapi/services/tiller.proto
+
2
−
4
View file @
538e8297
...
...
@@ -79,8 +79,7 @@ service ReleaseService {
rpc
GetHistory
(
GetHistoryRequest
)
returns
(
GetHistoryResponse
)
{
}
//TODO: move this to a test release service or rename to RunReleaseTest
// TestRelease runs the tests for a given release
// RunReleaseTest executes the tests defined of a named release
rpc
RunReleaseTest
(
TestReleaseRequest
)
returns
(
stream
TestReleaseResponse
)
{
}
}
...
...
@@ -318,8 +317,7 @@ message TestReleaseRequest {
int64
timeout
=
2
;
}
// TestReleaseResponse
// TestReleaseResponse
represents a message from executing a test
message
TestReleaseResponse
{
// TODO: change to repeated hapi.release.Release.Test results = 1; (for stream)
string
msg
=
1
;
}
This diff is collapsed.
Click to expand it.
cmd/helm/release_testing.go
+
1
−
1
View file @
538e8297
...
...
@@ -26,7 +26,7 @@ import (
)
const
releaseTestDesc
=
`
Th test command runs the tests for a release.
Th
e
test command runs the tests for a release.
The argument this command takes is the name of a deployed release.
The tests to be run are defined in the chart that was installed.
...
...
This diff is collapsed.
Click to expand it.
pkg/releasetesting/environment.go
+
2
−
2
View file @
538e8297
...
...
@@ -43,8 +43,8 @@ func streamError(info string, stream services.ReleaseService_RunReleaseTestServe
return
err
}
func
streamFailed
(
name
string
,
stream
services
.
ReleaseService_RunReleaseTestServer
)
error
{
msg
:=
fmt
.
Sprintf
(
"FAILED: %s, run `kubectl logs %s` for more info"
,
name
,
name
)
func
streamFailed
(
name
,
namespace
string
,
stream
services
.
ReleaseService_RunReleaseTestServer
)
error
{
msg
:=
fmt
.
Sprintf
(
"FAILED: %s, run `kubectl logs
%s --namespace
%s` for more info"
,
name
,
name
,
namespace
)
err
:=
streamMessage
(
msg
,
stream
)
return
err
}
...
...
This diff is collapsed.
Click to expand it.
pkg/releasetesting/test_suite.go
+
2
−
2
View file @
538e8297
...
...
@@ -103,10 +103,10 @@ func (t *TestSuite) Run(env *Environment) error {
}
}
else
if
resourceCreated
&&
resourceCleanExit
&&
status
==
api
.
PodFailed
{
test
.
result
.
Status
=
release
.
TestRun_FAILURE
if
streamErr
:=
streamFailed
(
test
.
result
.
Name
,
env
.
Stream
);
streamErr
!=
nil
{
if
streamErr
:=
streamFailed
(
test
.
result
.
Name
,
env
.
Namespace
,
env
.
Stream
);
streamErr
!=
nil
{
return
err
}
}
//else if resourceCreated && resourceCleanExit && status == api.PodUnkown {
}
test
.
result
.
CompletedAt
=
timeconv
.
Now
()
t
.
Results
=
append
(
t
.
Results
,
test
.
result
)
...
...
This diff is collapsed.
Click to expand it.
pkg/releasetesting/test_suite_test.go
+
1
−
1
View file @
538e8297
...
...
@@ -128,7 +128,7 @@ kind: Pod
metadata:
name: finding-nemo,
annotations:
"helm.sh/hook": test
"helm.sh/hook": test
-success
spec:
containers:
- name: nemo-test
...
...
This diff is collapsed.
Click to expand it.
pkg/tiller/release_server_test.go
+
1
−
1
View file @
538e8297
...
...
@@ -58,7 +58,7 @@ kind: Pod
metadata:
name: finding-nemo,
annotations:
"helm.sh/hook": test
"helm.sh/hook": test
-success
spec:
containers:
- name: nemo-test
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets