Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dex
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
dex
Commits
4ab78d0d
Commit
4ab78d0d
authored
Oct 26, 2016
by
Eric Chiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
storage/kubernetes: run transactional conformance tests
parent
5720ecf4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
18 deletions
+35
-18
storage.go
storage/kubernetes/storage.go
+27
-16
storage_test.go
storage/kubernetes/storage_test.go
+8
-2
No files found.
storage/kubernetes/storage.go
View file @
4ab78d0d
...
...
@@ -75,31 +75,42 @@ func (c *Config) open() (*client, error) {
return
nil
,
fmt
.
Errorf
(
"create client: %v"
,
err
)
}
// Don't try to synchronize this because creating third party resources is not
// a synchronous event. Even after the API server returns a 200, it can still
// take several seconds for them to actually appear.
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
go
func
()
{
for
{
if
err
:=
cli
.
createThirdPartyResources
();
err
!=
nil
{
log
.
Printf
(
"failed creating third party resources: %v"
,
err
)
}
else
{
return
}
select
{
case
<-
ctx
.
Done
()
:
return
case
<-
time
.
After
(
30
*
time
.
Second
)
:
// Try to synchronously create the third party resources once. This doesn't mean
// they'll immediately be available, but ensures that the client will actually try
// once.
if
err
:=
cli
.
createThirdPartyResources
();
err
!=
nil
{
log
.
Printf
(
"failed creating third party resources: %v"
,
err
)
go
func
()
{
for
{
if
err
:=
cli
.
createThirdPartyResources
();
err
!=
nil
{
log
.
Printf
(
"failed creating third party resources: %v"
,
err
)
}
else
{
return
}
select
{
case
<-
ctx
.
Done
()
:
return
case
<-
time
.
After
(
30
*
time
.
Second
)
:
}
}
}
}
()
}
()
}
// If the client is closed, stop trying to create third party resources.
cli
.
cancel
=
cancel
return
cli
,
nil
}
// createThirdPartyResources attempts to create the third party resources dex
// requires or identifies that they're already enabled.
//
// Creating a third party resource does not mean that they'll be immediately available.
//
// TODO(ericchiang): Provide an option to wait for the third party resources
// to actually be available.
func
(
cli
*
client
)
createThirdPartyResources
()
error
{
for
_
,
r
:=
range
thirdPartyResources
{
err
:=
cli
.
postResource
(
"extensions/v1beta1"
,
""
,
"thirdpartyresources"
,
r
)
...
...
storage/kubernetes/storage_test.go
View file @
4ab78d0d
package
kubernetes
import
(
"fmt"
"os"
"testing"
...
...
@@ -78,7 +79,7 @@ func TestURLFor(t *testing.T) {
func
TestStorage
(
t
*
testing
.
T
)
{
client
:=
loadClient
(
t
)
conformance
.
RunTests
(
t
,
func
()
storage
.
Storage
{
newStorage
:=
func
()
storage
.
Storage
{
for
_
,
resource
:=
range
[]
string
{
resourceAuthCode
,
resourceAuthRequest
,
...
...
@@ -88,9 +89,14 @@ func TestStorage(t *testing.T) {
resourcePassword
,
}
{
if
err
:=
client
.
deleteAll
(
resource
);
err
!=
nil
{
// Fatalf sometimes doesn't print the error message.
fmt
.
Fprintf
(
os
.
Stderr
,
"delete all %q failed: %v
\n
"
,
resource
,
err
)
t
.
Fatalf
(
"delete all %q failed: %v"
,
resource
,
err
)
}
}
return
client
})
}
conformance
.
RunTests
(
t
,
newStorage
)
conformance
.
RunTransactionTests
(
t
,
newStorage
)
}
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