Merge branch 'istaester/nbi-to-nib-refactoring' into istaester/init-application-framework

controller/api/role_test.go

@@ -61,7 +61,7 @@ func TestGetRole(t *testing.T) {
 		ctx  context.Context
 		addr string
 		name string
-		uuid uuid.UUID
+		id   uuid.UUID
 	}
 	tests := []struct {
 		name    string
@@ -75,6 +75,7 @@ func TestGetRole(t *testing.T) {
 				ctx:  context.TODO(),
 				addr: testAPIEndpoint,
 				name: "adminTestRole",
+				id:   uuid.Nil,
 			},
 			want: &apb.GetRoleResponse{
 				Status: apb.Status_STATUS_OK,
@@ -91,6 +92,7 @@ func TestGetRole(t *testing.T) {
 				ctx:  context.TODO(),
 				addr: testAPIEndpoint,
 				name: "not role",
+				id:   uuid.Nil,
 			},
 			want:    nil,
 			wantErr: true,
@@ -98,7 +100,7 @@ func TestGetRole(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := GetRole(tt.args.ctx, tt.args.addr, tt.args.name, tt.args.uuid)
+			got, err := GetRole(tt.args.ctx, tt.args.addr, tt.args.name, tt.args.id)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("GetRole() error = %v, wantErr %v", err, tt.wantErr)
 				return

controller/api/user_test.go

@@ -79,6 +79,7 @@ func TestGetUser(t *testing.T) {
 				ctx:  context.TODO(),
 				addr: testAPIEndpoint,
 				name: "testAdmin",
+				id:   uuid.Nil,
 			},
 			want: &apb.GetUserResponse{
 				Status: apb.Status_STATUS_OK,
@@ -95,6 +96,7 @@ func TestGetUser(t *testing.T) {
 				ctx:  context.TODO(),
 				addr: testAPIEndpoint,
 				name: "foos",
+				id:   uuid.Nil,
 			},
 			want:    nil,
 			wantErr: true,