Skip to content
This repository has been archived by the owner on Mar 16, 2024. It is now read-only.

Commit

Permalink
Fix credential tests to work with the new validation approach
Browse files Browse the repository at this point in the history
  • Loading branch information
@tylerslaton
tylerslaton committed Nov 3, 2022
1 parent 65d38e9 commit 398e84e
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 19 deletions.
63 changes: 44 additions & 19 deletions integration/client/credentials/credentials_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ func TestCredentialCreate(t *testing.T) {
helper.StartController(t)
restConfig := helper.StartAPI(t)

reg, close := helper.StartRegistry(t)
reg1, close1 := helper.StartRegistry(t)
defer close()
defer close1()

ctx := helper.GetCTX(t)
kclient := helper.MustReturn(kclient.Default)
ns := helper.TempNamespace(t, kclient)
Expand All @@ -24,29 +29,29 @@ func TestCredentialCreate(t *testing.T) {
t.Fatal(err)
}

cred, err := c.CredentialCreate(ctx, "example.com:443", "user", "pass")
cred, err := c.CredentialCreate(ctx, reg, "user", "pass")
if err != nil {
t.Fatal(err)
}

assert.Equal(t, "example.com:443", cred.Name)
assert.Equal(t, reg, cred.Name)
assert.Equal(t, apiv1.CredentialStorageTypeCluster, cred.Storage)
assert.Equal(t, "example.com:443", cred.ServerAddress)
assert.Equal(t, reg, cred.ServerAddress)
assert.Equal(t, "user", cred.Username)
assert.Equal(t, "", cred.Password)

cred1, err := c.CredentialCreate(ctx, "two.example.com:443", "user2", "pass2")
cred1, err := c.CredentialCreate(ctx, reg1, "user2", "pass2")
if err != nil {
t.Fatal(err)
}

assert.Equal(t, "two.example.com:443", cred1.Name)
assert.Equal(t, reg1, cred1.Name)
assert.Equal(t, apiv1.CredentialStorageTypeCluster, cred1.Storage)
assert.Equal(t, "two.example.com:443", cred1.ServerAddress)
assert.Equal(t, reg1, cred1.ServerAddress)
assert.Equal(t, "user2", cred1.Username)
assert.Equal(t, "", cred1.Password)

cred1New, err := c.CredentialGet(ctx, "two.example.com:443")
cred1New, err := c.CredentialGet(ctx, reg1)
if err != nil {
t.Fatal(err)
}
Expand All @@ -58,6 +63,11 @@ func TestCredentialList(t *testing.T) {
helper.StartController(t)
restConfig := helper.StartAPI(t)

reg, close := helper.StartRegistry(t)
reg1, close1 := helper.StartRegistry(t)
defer close()
defer close1()

ctx := helper.GetCTX(t)
kclient := helper.MustReturn(kclient.Default)
ns := helper.TempNamespace(t, kclient)
Expand All @@ -67,12 +77,12 @@ func TestCredentialList(t *testing.T) {
t.Fatal(err)
}

cred1, err := c.CredentialCreate(ctx, "example.com:443", "user", "pass")
cred1, err := c.CredentialCreate(ctx, reg, "user", "pass")
if err != nil {
t.Fatal(err)
}

cred2, err := c.CredentialCreate(ctx, "two.example.com:443", "user2", "pass2")
cred2, err := c.CredentialCreate(ctx, reg1, "user2", "pass2")
if err != nil {
t.Fatal(err)
}
Expand All @@ -94,6 +104,11 @@ func TestCredentialGet(t *testing.T) {
helper.StartController(t)
restConfig := helper.StartAPI(t)

reg, close := helper.StartRegistry(t)
reg1, close1 := helper.StartRegistry(t)
defer close()
defer close1()

ctx := helper.GetCTX(t)
kclient := helper.MustReturn(kclient.Default)
ns := helper.TempNamespace(t, kclient)
Expand All @@ -103,17 +118,17 @@ func TestCredentialGet(t *testing.T) {
t.Fatal(err)
}

_, err = c.CredentialCreate(ctx, "example.com:443", "user", "pass")
_, err = c.CredentialCreate(ctx, reg, "user", "pass")
if err != nil {
t.Fatal(err)
}

cred1, err := c.CredentialCreate(ctx, "two.example.com:443", "user2", "pass2")
cred1, err := c.CredentialCreate(ctx, reg1, "user2", "pass2")
if err != nil {
t.Fatal(err)
}

cred1New, err := c.CredentialGet(ctx, "two.example.com:443")
cred1New, err := c.CredentialGet(ctx, reg1)
if err != nil {
t.Fatal(err)
}
Expand All @@ -125,6 +140,11 @@ func TestCredentialUpdate(t *testing.T) {
helper.StartController(t)
restConfig := helper.StartAPI(t)

reg, close := helper.StartRegistry(t)
reg1, close1 := helper.StartRegistry(t)
defer close()
defer close1()

ctx := helper.GetCTX(t)
kclient := helper.MustReturn(kclient.Default)
ns := helper.TempNamespace(t, kclient)
Expand All @@ -134,22 +154,22 @@ func TestCredentialUpdate(t *testing.T) {
t.Fatal(err)
}

_, err = c.CredentialCreate(ctx, "example.com:443", "user", "pass")
_, err = c.CredentialCreate(ctx, reg, "user", "pass")
if err != nil {
t.Fatal(err)
}

_, err = c.CredentialCreate(ctx, "two.example.com:443", "user2", "pass2")
_, err = c.CredentialCreate(ctx, reg1, "user2", "pass2")
if err != nil {
t.Fatal(err)
}

cred1New, err := c.CredentialUpdate(ctx, "two.example.com:443", "user3", "pass3")
cred1New, err := c.CredentialUpdate(ctx, reg1, "user3", "pass3")
if err != nil {
t.Fatal(err)
}

cred1NewNew, err := c.CredentialGet(ctx, "two.example.com:443")
cred1NewNew, err := c.CredentialGet(ctx, reg1)
if err != nil {
t.Fatal(err)
}
Expand All @@ -163,6 +183,11 @@ func TestCredentialDelete(t *testing.T) {
helper.StartController(t)
restConfig := helper.StartAPI(t)

reg, close := helper.StartRegistry(t)
reg1, close1 := helper.StartRegistry(t)
defer close()
defer close1()

ctx := helper.GetCTX(t)
kclient := helper.MustReturn(kclient.Default)
ns := helper.TempNamespace(t, kclient)
Expand All @@ -172,12 +197,12 @@ func TestCredentialDelete(t *testing.T) {
t.Fatal(err)
}

_, err = c.CredentialCreate(ctx, "example.com:443", "user", "pass")
_, err = c.CredentialCreate(ctx, reg, "user", "pass")
if err != nil {
t.Fatal(err)
}

_, err = c.CredentialCreate(ctx, "two.example.com:443", "user2", "pass2")
_, err = c.CredentialCreate(ctx, reg1, "user2", "pass2")
if err != nil {
t.Fatal(err)
}
Expand All @@ -189,7 +214,7 @@ func TestCredentialDelete(t *testing.T) {

assert.Len(t, creds, 2)

_, err = c.CredentialDelete(ctx, "two.example.com:443")
_, err = c.CredentialDelete(ctx, reg1)
if err != nil {
t.Fatal(err)
}
Expand Down
3 changes: 3 additions & 0 deletions pkg/client/credentials.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package client

import (
"context"
"fmt"
"net/http"
"sort"

Expand Down Expand Up @@ -103,6 +104,7 @@ func credentialValidate(ctx context.Context, username, password, serverAddress s
// Build a registry struct for the host
reg, err := name.NewRegistry(serverAddress)
if err != nil {
fmt.Println("1\n\n\n\n")
return err
}

Expand All @@ -111,6 +113,7 @@ func credentialValidate(ctx context.Context, username, password, serverAddress s
auth := &authn.Basic{Username: username, Password: password}
_, err = transport.NewWithContext(ctx, reg, auth, http.DefaultTransport, scopes)
if err != nil {
fmt.Println(err, "\n\n\n\n")
return err
}

Expand Down

0 comments on commit 398e84e

Please sign in to comment.