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
3be42cd6
Commit
3be42cd6
authored
9 years ago
by
Jack Greenfield
Browse files
Options
Download
Plain Diff
Merge pull request #324 from michelleN/status
feat(*): add helm dm status command
parents
b829c010
2663bcc8
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
kube-update-test
release-2.0
release-2.1
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
1.999.0
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
v2.1.3
v2.1.2
v2.1.1
v2.1.0
v2.0.2
v2.0.1
v2.0.0
v2.0.0-rc.2
v2.0.0-rc.1
v2.0.0-beta.2
v2.0.0-beta.1
v2.0.0-alpha.5
v2.0.0-alpha.4
v2.0.0-alpha.3
v2.0.0-alpha.2
v2.0.0-alpha.1
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
cmd/helm/dm.go
+23
-2
cmd/helm/dm.go
pkg/kubectl/command.go
+1
-0
pkg/kubectl/command.go
pkg/kubectl/get.go
+12
-4
pkg/kubectl/get.go
pkg/kubectl/get_test.go
+12
-0
pkg/kubectl/get_test.go
pkg/kubectl/kubectl_test.go
+4
-0
pkg/kubectl/kubectl_test.go
with
52 additions
and
6 deletions
+52
-6
cmd/helm/dm.go
+
23
−
2
View file @
3be42cd6
...
...
@@ -78,9 +78,16 @@ func dmCmd() cli.Command {
Name
:
"status"
,
Usage
:
"Show status of DM."
,
ArgsUsage
:
""
,
Flags
:
[]
cli
.
Flag
{
cli
.
BoolFlag
{
Name
:
"dry-run"
,
Usage
:
"Only display the underlying kubectl commands."
,
},
},
Action
:
func
(
c
*
cli
.
Context
)
{
format
.
Err
(
"Not yet implemented"
)
os
.
Exit
(
1
)
if
err
:=
status
(
c
.
Bool
(
"dry-run"
));
err
!=
nil
{
os
.
Exit
(
1
)
}
},
},
{
...
...
@@ -126,6 +133,20 @@ func uninstall(dryRun bool) error {
return
nil
}
func
status
(
dryRun
bool
)
error
{
client
:=
kubectl
.
Client
if
dryRun
{
client
=
kubectl
.
PrintRunner
{}
}
out
,
err
:=
client
.
GetByKind
(
"pods"
,
""
,
"dm"
)
if
err
!=
nil
{
return
err
}
format
.
Msg
(
string
(
out
))
return
nil
}
func
getKubectlRunner
(
dryRun
bool
)
kubectl
.
Runner
{
if
dryRun
{
return
&
kubectl
.
PrintRunner
{}
...
...
This diff is collapsed.
Click to expand it.
pkg/kubectl/command.go
+
1
−
0
View file @
3be42cd6
...
...
@@ -33,6 +33,7 @@ func command(args ...string) *cmd {
}
func
assignStdin
(
cmd
*
cmd
,
in
[]
byte
)
{
fmt
.
Println
(
string
(
in
))
cmd
.
Stdin
=
bytes
.
NewBuffer
(
in
)
}
...
...
This diff is collapsed.
Click to expand it.
pkg/kubectl/get.go
+
12
−
4
View file @
3be42cd6
...
...
@@ -29,9 +29,13 @@ func (r RealRunner) Get(stdin []byte, ns string) ([]byte, error) {
return
cmd
.
CombinedOutput
()
}
// GetByKind gets
a named thing by kind.
// GetByKind gets
resources by kind, name(optional), and namespace(optional)
func
(
r
RealRunner
)
GetByKind
(
kind
,
name
,
ns
string
)
(
string
,
error
)
{
args
:=
[]
string
{
"get"
,
kind
,
name
}
args
:=
[]
string
{
"get"
,
kind
}
if
name
!=
""
{
args
=
append
([]
string
{
name
},
args
...
)
}
if
ns
!=
""
{
args
=
append
([]
string
{
"--namespace="
+
ns
},
args
...
)
...
...
@@ -54,9 +58,13 @@ func (r PrintRunner) Get(stdin []byte, ns string) ([]byte, error) {
return
[]
byte
(
cmd
.
String
()),
nil
}
// GetByKind gets
a named thing by kind.
// GetByKind gets
resources by kind, name(optional), and namespace(optional)
func
(
r
PrintRunner
)
GetByKind
(
kind
,
name
,
ns
string
)
(
string
,
error
)
{
args
:=
[]
string
{
"get"
,
kind
,
name
}
args
:=
[]
string
{
"get"
,
kind
}
if
name
!=
""
{
args
=
append
([]
string
{
name
},
args
...
)
}
if
ns
!=
""
{
args
=
append
([]
string
{
"--namespace="
+
ns
},
args
...
)
...
...
This diff is collapsed.
Click to expand it.
pkg/kubectl/get_test.go
+
12
−
0
View file @
3be42cd6
...
...
@@ -31,3 +31,15 @@ func TestGet(t *testing.T) {
t
.
Errorf
(
"%s != %s"
,
string
(
out
),
expects
)
}
}
func
TestGetByKind
(
t
*
testing
.
T
)
{
Client
=
TestRunner
{
out
:
[]
byte
(
"running the GetByKind command"
),
}
expects
:=
"running the GetByKind command"
out
,
_
:=
Client
.
GetByKind
(
"pods"
,
""
,
""
)
if
out
!=
expects
{
t
.
Errorf
(
"%s != %s"
,
out
,
expects
)
}
}
This diff is collapsed.
Click to expand it.
pkg/kubectl/kubectl_test.go
+
4
−
0
View file @
3be42cd6
...
...
@@ -26,3 +26,7 @@ type TestRunner struct {
func
(
r
TestRunner
)
Get
(
stdin
[]
byte
,
ns
string
)
([]
byte
,
error
)
{
return
r
.
out
,
r
.
err
}
func
(
r
TestRunner
)
GetByKind
(
kind
,
name
,
ns
string
)
(
string
,
error
)
{
return
string
(
r
.
out
),
r
.
err
}
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