os.Setenv("INFO_JOB_CALLBACK_HOST", "jobCallbackHost")
os.Setenv("INFO_JOB_CALLBACK_PORT", "8096")
os.Setenv("INFO_COORD_ADDR", "infoCoordAddr")
- defer os.Clearenv()
+ t.Cleanup(func() {
+ os.Clearenv()
+ })
wantConfig := Config{
LogLevel: "Debug",
InfoProducerSupervisionCallbackHost: "supervisionCallbackHost",
}
func TestNew_faultyIntValueSetConfigContainDefaultValueAndWarnInLog(t *testing.T) {
- os.Clearenv()
assertions := require.New(t)
var buf bytes.Buffer
log.SetOutput(&buf)
- defer func() {
- log.SetOutput(os.Stderr)
- }()
os.Setenv("INFO_PRODUCER_SUPERVISION_CALLBACK_PORT", "wrong")
- defer os.Clearenv()
+ t.Cleanup(func() {
+ log.SetOutput(os.Stderr)
+ os.Clearenv()
+ })
wantConfig := Config{
LogLevel: "Info",
InfoProducerSupervisionCallbackHost: "",
}
func TestNew_envVarsNotSetConfigContainDefaultValues(t *testing.T) {
- os.Clearenv()
wantConfig := Config{
LogLevel: "Info",
InfoProducerSupervisionCallbackHost: "",
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
- "oransc.org/nonrtric/dmaapmediatorproducer/internal/jobtypes"
+ "oransc.org/nonrtric/dmaapmediatorproducer/internal/jobs"
"oransc.org/nonrtric/dmaapmediatorproducer/internal/restclient"
"oransc.org/nonrtric/dmaapmediatorproducer/mocks"
)
restclient.Client = &clientMock
- type1 := jobtypes.Type{
+ type1 := jobs.Type{
TypeId: "Type1",
Schema: `{"title": "Type 1"}`,
}
- types := []*jobtypes.Type{&type1}
+ types := []*jobs.Type{&type1}
r := NewRegistratorImpl("http://localhost:9990")
err := r.RegisterTypes(types)
package jobs
import (
+ "fmt"
"os"
"path/filepath"
"strings"
}
func (jh *jobHandlerImpl) AddJob(ji JobInfo) error {
- if jobs, ok := allJobs[ji.InfoTypeIdentity]; ok {
- if _, ok := jobs[ji.InfoJobIdentity]; ok {
- // TODO: Update job
- } else {
- jobs[ji.InfoJobIdentity] = ji
- }
+ if err := validateJobInfo(ji); err == nil {
+ jobs := allJobs[ji.InfoTypeIdentity]
+ jobs[ji.InfoJobIdentity] = ji
+ return nil
+ } else {
+ return err
+ }
+}
+
+func validateJobInfo(ji JobInfo) error {
+ if _, ok := allJobs[ji.InfoTypeIdentity]; !ok {
+ return fmt.Errorf("type not supported: %v", ji.InfoTypeIdentity)
+ }
+ if ji.InfoJobIdentity == "" {
+ return fmt.Errorf("missing required job identity: %v", ji)
+ }
+ // Temporary for when there are only REST callbacks needed
+ if ji.TargetUri == "" {
+ return fmt.Errorf("missing required target URI: %v", ji)
}
return nil
}
return nil, err
}
}
+
+func clearAll() {
+ allJobs = make(map[string]map[string]JobInfo)
+}
if err != nil {
t.Errorf("Unable to create temporary directory for types due to: %v", err)
}
- defer os.RemoveAll(typesDir)
+ t.Cleanup(func() {
+ os.RemoveAll(typesDir)
+ clearAll()
+ })
typeDir = typesDir
fname := filepath.Join(typesDir, "type1.json")
if err = os.WriteFile(fname, []byte(type1Schema), 0666); err != nil {
assertions.EqualValues([]string{"type1"}, supportedTypes)
}
-func TestAddJob_shouldAddJobToAllJobsMap(t *testing.T) {
+func TestAddJobWhenTypeIsSupported_shouldAddJobToAllJobsMap(t *testing.T) {
assertions := require.New(t)
allJobs["type1"] = make(map[string]JobInfo)
+ t.Cleanup(func() {
+ clearAll()
+ })
jobInfo := JobInfo{
Owner: "owner",
LastUpdated: "now",
err := AddJob(jobInfo)
assertions.Nil(err)
assertions.Equal(1, len(allJobs["type1"]))
+ assertions.Equal(jobInfo, allJobs["type1"]["job1"])
+}
+
+func TestAddJobWhenTypeIsNotSupported_shouldReturnError(t *testing.T) {
+ assertions := require.New(t)
+ jobInfo := JobInfo{
+ InfoTypeIdentity: "type1",
+ }
+
+ err := AddJob(jobInfo)
+ assertions.NotNil(err)
+ assertions.Equal("type not supported: type1", err.Error())
+}
+
+func TestAddJobWhenJobIdMissing_shouldReturnError(t *testing.T) {
+ assertions := require.New(t)
+ allJobs["type1"] = make(map[string]JobInfo)
+ t.Cleanup(func() {
+ clearAll()
+ })
+ jobInfo := JobInfo{
+ InfoTypeIdentity: "type1",
+ }
+
+ err := AddJob(jobInfo)
+ assertions.NotNil(err)
+ assertions.Equal("missing required job identity: { type1}", err.Error())
+}
+
+func TestAddJobWhenTargetUriMissing_shouldReturnError(t *testing.T) {
+ assertions := require.New(t)
+ allJobs["type1"] = make(map[string]JobInfo)
+ jobInfo := JobInfo{
+ InfoTypeIdentity: "type1",
+ InfoJobIdentity: "job1",
+ }
+
+ err := AddJob(jobInfo)
+ assertions.NotNil(err)
+ assertions.Equal("missing required target URI: { job1 type1}", err.Error())
+ clearAll()
}
}
func getRequestError(response *http.Response) RequestError {
+ defer response.Body.Close()
responseData, _ := io.ReadAll(response.Body)
putError := RequestError{
StatusCode: response.StatusCode,