Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
d3360a32
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
d3360a32
编写于
2月 23, 2021
作者:
M
Medya Ghazizadeh
提交者:
GitHub
2月 23, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10586 from spowelljr/fixAuditErrors
Fixed audit.json error when `delete --purge` ran
上级
57d33de8
a0b05642
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
69 addition
and
15 deletion
+69
-15
go.sum
go.sum
+0
-9
pkg/minikube/audit/audit.go
pkg/minikube/audit/audit.go
+25
-3
pkg/minikube/audit/audit_test.go
pkg/minikube/audit/audit_test.go
+44
-3
未找到文件。
go.sum
浏览文件 @
d3360a32
...
...
@@ -17,7 +17,6 @@ cloud.google.com/go v0.61.0/go.mod h1:XukKJg4Y7QsUu0Hxg3qQKUWR4VuWivmyMK2+rUyxAq
cloud.google.com/go
v0.62.0/go.mod h1:
jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
cloud.google.com/go
v0.65.0/go.mod h1:
O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
cloud.google.com/go
v0.72.0/go.mod h1:
M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
cloud.google.com/go
v0.74.0 h1:
kpgPA77kSSbjSs+fWHkPTxQ6J5Z2Qkruo5jfXEkHxNQ=
cloud.google.com/go
v0.74.0/go.mod h1:
VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
cloud.google.com/go
v0.75.0 h1:
XgtDnVJRCPEUG21gjFiRPz4zI1Mjg16R+NYQjfmU4XY=
cloud.google.com/go
v0.75.0/go.mod h1:
VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
...
...
@@ -38,7 +37,6 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy
cloud.google.com/go/storage
v1.5.0/go.mod h1:
tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
cloud.google.com/go/storage
v1.6.0/go.mod h1:
N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
cloud.google.com/go/storage
v1.8.0/go.mod h1:
Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage
v1.10.0 h1:
STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA=
cloud.google.com/go/storage
v1.10.0/go.mod h1:
FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
cloud.google.com/go/storage
v1.13.0 h1:
amPvhCOI+Hltp6rPu+62YdwhIrjf+34PKVAL4HwgYwk=
cloud.google.com/go/storage
v1.13.0/go.mod h1:
pqFyBUK3zZqMIIU5+8NaZq6/Ma3ClgUg9Hv5jfuJnvo=
...
...
@@ -1024,7 +1022,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
golang.org/x/mod
v0.1.1-0.20191107180719-034126e5016b/go.mod h1:
QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod
v0.2.0/go.mod h1:
s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod
v0.3.0/go.mod h1:
s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod
v0.4.0 h1:
8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8=
golang.org/x/mod
v0.4.0/go.mod h1:
s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod
v0.4.1 h1:
Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY=
golang.org/x/mod
v0.4.1/go.mod h1:
s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
...
...
@@ -1078,7 +1075,6 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R
golang.org/x/net
v0.0.0-20201021035429-f5854403a974/go.mod h1:
sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net
v0.0.0-20201031054903-ff519b6c9102/go.mod h1:
sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net
v0.0.0-20201110031124-69a78807bb2b/go.mod h1:
sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net
v0.0.0-20201209123823-ac852fbbde11 h1:
lwlPPsmjDKK0J6eG6xDWd5XPehI0R024zxjDnw3esPA=
golang.org/x/net
v0.0.0-20201209123823-ac852fbbde11/go.mod h1:
m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net
v0.0.0-20201224014010-6772e930b67b h1:
iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw=
golang.org/x/net
v0.0.0-20201224014010-6772e930b67b/go.mod h1:
m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
...
...
@@ -1090,7 +1086,6 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr
golang.org/x/oauth2
v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:
gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2
v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:
KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2
v0.0.0-20201109201403-9fd604954f58/go.mod h1:
KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2
v0.0.0-20201208152858-08078c50e5b5 h1:
Lm4OryKCca1vehdsWogr9N4t7NfZxLbJoc/H0w4K4S4=
golang.org/x/oauth2
v0.0.0-20201208152858-08078c50e5b5/go.mod h1:
KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2
v0.0.0-20210113205817-d3ed898aa8a3 h1:
BaN3BAqnopnKjvl+15DYP6LLrbBHfbfmlFYzmFj/Q9Q=
golang.org/x/oauth2
v0.0.0-20210113205817-d3ed898aa8a3/go.mod h1:
KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
...
...
@@ -1164,7 +1159,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys
v0.0.0-20201024232916-9f70ab9862d5/go.mod h1:
h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys
v0.0.0-20201119102817-f84b799fce68/go.mod h1:
h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys
v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:
h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys
v0.0.0-20210104204734-6f8348627aad h1:
MCsdmFSdEd4UEa5TKS5JztCRHK/WtvNei1edOj5RSRo=
golang.org/x/sys
v0.0.0-20210104204734-6f8348627aad/go.mod h1:
h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys
v0.0.0-20210119212857-b64e53b001e4/go.mod h1:
h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys
v0.0.0-20210124154548-22da62e12c0c h1:
VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
...
...
@@ -1255,7 +1249,6 @@ golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4X
golang.org/x/tools
v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:
emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools
v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:
emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools
v0.0.0-20201208233053-a543418bbed2/go.mod h1:
emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools
v0.0.0-20210105154028-b0ab187a4818 h1:
u2ssHESKr0HP2d1wlnjMKH+V/22Vg1lGCVuXmOYU1qA=
golang.org/x/tools
v0.0.0-20210105154028-b0ab187a4818/go.mod h1:
emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools
v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:
emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools
v0.1.0 h1:
po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
...
...
@@ -1339,7 +1332,6 @@ google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6D
google.golang.org/genproto
v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:
FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto
v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:
FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto
v0.0.0-20201210142538-e3217bee35cc/go.mod h1:
FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto
v0.0.0-20201214200347-8c77b98c765d h1:
HV9Z9qMhQEsdlvxNFELgQ11RkMzO3CMkjEySjCtuLes=
google.golang.org/genproto
v0.0.0-20201214200347-8c77b98c765d/go.mod h1:
FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto
v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:
FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto
v0.0.0-20210203152818-3206188e46ba h1:
np3A9jnmE/eMtrOwwvUycmQ1XoLyj5nqZ41bAyYLqJ0=
...
...
@@ -1361,7 +1353,6 @@ google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
google.golang.org/grpc
v1.31.1/go.mod h1:
N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc
v1.32.0/go.mod h1:
N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc
v1.33.2/go.mod h1:
JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
google.golang.org/grpc
v1.34.0 h1:
raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
google.golang.org/grpc
v1.34.0/go.mod h1:
WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc
v1.35.0 h1:
TwIQcH3es+MojMVojxxfQ3l3OF2KzlRxML2xZq0kRo8=
google.golang.org/grpc
v1.35.0/go.mod h1:
qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
...
...
pkg/minikube/audit/audit.go
浏览文件 @
d3360a32
...
...
@@ -57,18 +57,23 @@ func Log(startTime time.Time) {
}
r
:=
newRow
(
os
.
Args
[
1
],
args
(),
userName
(),
version
.
GetVersion
(),
startTime
,
time
.
Now
())
if
err
:=
appendToLog
(
r
);
err
!=
nil
{
klog
.
Error
(
err
)
klog
.
Warning
(
err
)
}
}
// shouldLog returns if the command should be logged.
func
shouldLog
()
bool
{
// commands that should not be logged.
no
:=
[]
string
{
"status"
,
"version"
}
// in rare chance we get here without a command, don't log
if
len
(
os
.
Args
)
<
2
{
return
false
}
if
isDeletePurge
()
{
return
false
}
// commands that should not be logged.
no
:=
[]
string
{
"status"
,
"version"
}
a
:=
os
.
Args
[
1
]
for
_
,
c
:=
range
no
{
if
a
==
c
{
...
...
@@ -77,3 +82,20 @@ func shouldLog() bool {
}
return
true
}
// isDeletePurge return true if command is delete with purge flag.
func
isDeletePurge
()
bool
{
args
:=
os
.
Args
if
len
(
args
)
<
2
{
return
false
}
if
args
[
1
]
!=
"delete"
{
return
false
}
for
_
,
a
:=
range
args
{
if
a
==
"--purge"
{
return
true
}
}
return
false
}
pkg/minikube/audit/audit_test.go
浏览文件 @
d3360a32
...
...
@@ -26,7 +26,7 @@ import (
)
func
TestAudit
(
t
*
testing
.
T
)
{
t
.
Run
(
"
U
sername"
,
func
(
t
*
testing
.
T
)
{
t
.
Run
(
"
u
sername"
,
func
(
t
*
testing
.
T
)
{
u
,
err
:=
user
.
Current
()
if
err
!=
nil
{
t
.
Fatal
(
err
)
...
...
@@ -57,7 +57,7 @@ func TestAudit(t *testing.T) {
}
})
t
.
Run
(
"
A
rgs"
,
func
(
t
*
testing
.
T
)
{
t
.
Run
(
"
a
rgs"
,
func
(
t
*
testing
.
T
)
{
oldArgs
:=
os
.
Args
defer
func
()
{
os
.
Args
=
oldArgs
}()
...
...
@@ -86,7 +86,7 @@ func TestAudit(t *testing.T) {
}
})
t
.
Run
(
"
S
houldLog"
,
func
(
t
*
testing
.
T
)
{
t
.
Run
(
"
s
houldLog"
,
func
(
t
*
testing
.
T
)
{
oldArgs
:=
os
.
Args
defer
func
()
{
os
.
Args
=
oldArgs
}()
...
...
@@ -114,6 +114,10 @@ func TestAudit(t *testing.T) {
[]
string
{
"minikube"
},
false
,
},
{
[]
string
{
"minikube"
,
"delete"
,
"--purge"
},
false
,
},
}
for
_
,
test
:=
range
tests
{
...
...
@@ -126,4 +130,41 @@ func TestAudit(t *testing.T) {
}
}
})
t
.
Run
(
"isDeletePurge"
,
func
(
t
*
testing
.
T
)
{
oldArgs
:=
os
.
Args
defer
func
()
{
os
.
Args
=
oldArgs
}()
tests
:=
[]
struct
{
args
[]
string
want
bool
}{
{
[]
string
{
"minikube"
,
"delete"
,
"--purge"
},
true
,
},
{
[]
string
{
"minikube"
,
"delete"
},
false
,
},
{
[]
string
{
"minikube"
,
"start"
,
"--purge"
},
false
,
},
{
[]
string
{
"minikube"
},
false
,
},
}
for
_
,
test
:=
range
tests
{
os
.
Args
=
test
.
args
got
:=
isDeletePurge
()
if
got
!=
test
.
want
{
t
.
Errorf
(
"os.Args = %q; isDeletePurge() = %t; want %t"
,
os
.
Args
,
got
,
test
.
want
)
}
}
})
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录