github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32593 from johnbieren/master

Browse Source 
Automatic merge from submit-queue

Fix audit_test regex for iso8601 timestamps

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**:  The audit_test unit test fails as some iso8601 timestamps are of the form 2016-09-13T10:32:50.823081217Z and the current regex doesn't allow T's or Z's.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:NONE
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
```

Signed-off-by: Johnny Bieren <jbieren@redhat.com>
This commit is contained in:
Kubernetes Submit Queue
2016-09-14 23:47:23 -07:00
committed by GitHub
parent d1256498ff df6299d110
commit 1ad5c5e4f7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apiserver/audit/audit_test.go
View File

@@ -95,14 +95,14 @@ func TestAudit(t *testing.T) {
if len(line) != 2 { if len(line) != 2 {
t.Fatalf("Unexpected amount of lines in audit log: %d", len(line)) t.Fatalf("Unexpected amount of lines in audit log: %d", len(line))
} }
match, err := regexp.MatchString(`[\d\:\-\.\+]+ AUDIT: id="[\w-]+" ip="127.0.0.1" method="GET" user="admin" as="<self>" namespace="default" uri="/api/v1/namespaces/default/pods"`, line[0]) match, err := regexp.MatchString(`[\d\:\-\.\+TZ]+ AUDIT: id="[\w-]+" ip="127.0.0.1" method="GET" user="admin" as="<self>" namespace="default" uri="/api/v1/namespaces/default/pods"`, line[0])
if err != nil { if err != nil {
t.Errorf("Unexpected error matching first line: %v", err) t.Errorf("Unexpected error matching first line: %v", err)
} }
if !match { if !match {
t.Errorf("Unexpected first line of audit: %s", line[0]) t.Errorf("Unexpected first line of audit: %s", line[0])
} }
match, err = regexp.MatchString(`[\d\:\-\.\+]+ AUDIT: id="[\w-]+" response="200"`, line[1]) match, err = regexp.MatchString(`[\d\:\-\.\+TZ]+ AUDIT: id="[\w-]+" response="200"`, line[1])
if err != nil { if err != nil {
t.Errorf("Unexpected error matching second line: %v", err) t.Errorf("Unexpected error matching second line: %v", err)
} }