Skip to content

Commit

Permalink
fix unit tests (#4)
Browse files Browse the repository at this point in the history 
* fix

Signed-off-by: wfan <wfan@yahoo-corp.jp>

* fix

Signed-off-by: wfan <wfan@yahoo-corp.jp>

* fix

Signed-off-by: wfan <wfan@yahoo-corp.jp>

* fix err msg, fix test case

Signed-off-by: wfan <wfan@yahoo-corp.jp>

* fix

Signed-off-by: wfan <wfan@yahoo-corp.jp>

* fix unit tests

Signed-off-by: wfan <wfan@yahoo-corp.jp>

* fix unit test 2

Signed-off-by: wfan <wfan@yahoo-corp.jp>

---------

Signed-off-by: wfan <wfan@yahoo-corp.jp>
Co-authored-by: kevindiu <kevin_diu@yahoo.com.hk>
Co-authored-by: Aaron Jeongwoo Kim <53258958+mlajkim@users.noreply.github.com>
  • Loading branch information
@WindzCUHK @kevindiu @mlajkim
3 people authored Dec 2, 2024
1 parent 3f46fcc commit 66437ad
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 45 deletions.
2 changes: 1 addition & 1 deletion service/token.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func NewTokenService(cfg config.Token) (TokenService, error) {
keyData, err := ioutil.ReadFile(config.GetActualValue(cfg.PrivateKey))
if err != nil && keyData == nil {
if cfg.NTokenPath == "" {
return nil, errors.Wrap(err, "invalid token certificate")
return nil, errors.Wrap(err, "invalid token private key")
}
}

Expand Down
4 changes: 2 additions & 2 deletions service/token_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func TestNewTokenService(t *testing.T) {
afterFunc: func() {
os.Unsetenv(keyEnvName)
},
wantErr: fmt.Errorf("invalid token certificate: open %v", "notexists: no such file or directory"),
wantErr: fmt.Errorf("invalid token private key: open %v", "notexists: no such file or directory"),
}
}(),
func() test {
Expand All @@ -109,7 +109,7 @@ func TestNewTokenService(t *testing.T) {
afterFunc: func() {
os.Unsetenv(keyEnvName)
},
wantErr: fmt.Errorf("invalid token certificate: open %v", "notexists: no such file or directory"),
wantErr: fmt.Errorf("invalid token private key: open %v", "notexists: no such file or directory"),
}
}(),
func() test {
Expand Down
76 changes: 34 additions & 42 deletions usecase/garmd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@ func TestNew(t *testing.T) {
wantErr: fmt.Errorf("token service instantiate failed: invalid token refresh duration : time: invalid duration \"\""),
},
func() test {
keyEnvName := "dummyKey"
keyKey := "dummyKey"
key := "../service/testdata/dummyServer.key"

return test{
name: "Check error when new server",
args: args{
cfg: config.Config{
Token: config.Token{
AthenzDomain: keyEnvName,
ServiceName: keyEnvName,
PrivateKey: "_" + keyEnvName + "_",
AthenzDomain: keyKey,
ServiceName: keyKey,
PrivateKey: "_" + keyKey + "_",
ValidateToken: false,
RefreshDuration: "1m",
KeyVersion: "1",
Expand All @@ -74,23 +74,22 @@ func TestNew(t *testing.T) {
},
},
beforeFunc: func() {
os.Setenv(keyEnvName, key)
os.Setenv(keyKey, key)
},
afterFunc: func() {
os.Unsetenv(keyEnvName)
os.Unsetenv(keyKey)
},
wantErr: fmt.Errorf("athenz service instantiate failed: athenz timeout parse failed: time: invalid duration \"\""),
}
}(),
func() test {
keyEnvName := "dummyKey"
key := "../service/testdata/dummyServer.key"
cfg := config.Config{
Token: config.Token{
AthenzDomain: keyEnvName,
ServiceName: keyEnvName,
AthenzDomain: "dummyDomain",
ServiceName: "dummyService",
NTokenPath: "",
PrivateKey: "_" + keyEnvName + "_",
PrivateKey: key,
ValidateToken: false,
RefreshDuration: "1m",
KeyVersion: "1",
Expand All @@ -105,23 +104,16 @@ func TestNew(t *testing.T) {
},
}

os.Setenv(keyEnvName, key)

return test{
name: "Check new garm daemon return correct",
args: args{
cfg: cfg,
},
beforeFunc: func() {
os.Setenv(keyEnvName, key)
},
afterFunc: func() {
os.Unsetenv(keyEnvName)
},
want: func() GarmDaemon {
token, err := service.NewTokenService(cfg.Token)
if token == nil || err != nil {
t.Errorf("fsdf %v", err)
t.Errorf("%v", err)
t.Fail()
}

resolver := service.NewResolver(cfg.Mapping)
Expand All @@ -137,6 +129,7 @@ func TestNew(t *testing.T) {
athenz: athenz,
server: server,
}

}(),
}
}(),
Expand Down Expand Up @@ -193,17 +186,17 @@ func Test_garm_Start(t *testing.T) {
}
tests := []test{
func() test {
keyEnvName := "dummy_key"
keyKey := "dummy_key"
key := "../service/testdata/dummyServer.key"
certEnvName := "dummy_cert"
certKey := "dummy_cert"
cert := "../service/testdata/dummyServer.crt"

cfg := config.Config{
Token: config.Token{
AthenzDomain: keyEnvName,
ServiceName: keyEnvName,
AthenzDomain: "dummyDomain",
ServiceName: "dummyService",
NTokenPath: "",
PrivateKey: "_" + keyEnvName + "_",
PrivateKey: key,
ValidateToken: false,
RefreshDuration: "1m",
KeyVersion: "1",
Expand All @@ -214,25 +207,29 @@ func Test_garm_Start(t *testing.T) {
URL: "/",
},
Server: config.Server{
HealthzPath: "/",
ShutdownDuration: "5s",
HealthzPath: "/",
TLS: config.TLS{
Enabled: true,
Cert: "_" + certEnvName + "_",
Key: "_" + keyEnvName + "_",
Cert: "_" + certKey + "_",
Key: "_" + keyKey + "_",
},
},
}
ctx, cancelFunc := context.WithCancel(context.Background())

os.Setenv(keyEnvName, key)

return test{
name: "Check success start garm daemon",
args: args{
ctx: ctx,
},
fields: func() fields {
os.Setenv(certKey, cert)
os.Setenv(keyKey, key)
defer func() {
os.Unsetenv(keyKey)
os.Unsetenv(certKey)
}()

token, _ := service.NewTokenService(cfg.Token)

resolver := service.NewResolver(cfg.Mapping)
Expand All @@ -249,9 +246,8 @@ func Test_garm_Start(t *testing.T) {
server: server,
}
}(),
beforeFunc: func() {
os.Setenv(certEnvName, cert)
os.Setenv(keyEnvName, key)
afterFunc: func() {
cancelFunc()
},
checkFunc: func(got chan []error, want []error) error {
cancelFunc()
Expand All @@ -264,11 +260,6 @@ func Test_garm_Start(t *testing.T) {
return nil

},
afterFunc: func() {
os.Unsetenv(keyEnvName)
os.Setenv(certEnvName, cert)
cancelFunc()
},
want: []error{context.Canceled},
}
}(),
Expand All @@ -283,11 +274,12 @@ func Test_garm_Start(t *testing.T) {
tt.beforeFunc()
}

fields := tt.fields
g := &garm{
cfg: tt.fields.cfg,
token: tt.fields.token,
athenz: tt.fields.athenz,
server: tt.fields.server,
cfg: fields.cfg,
token: fields.token,
athenz: fields.athenz,
server: fields.server,
}
got := g.Start(tt.args.ctx)
if err := tt.checkFunc(got, tt.want); err != nil {
Expand Down

0 comments on commit 66437ad

Please sign in to comment.