Updated go.mod and deps

Author: janis-gross

go.mod

@@ -3,7 +3,7 @@ module snmpsim-cli-manager
 go 1.13
 
 require (
-	github.com/inexio/snmpsim-restapi-go-client v0.0.0-20200311131246-b484400d0e35
+	github.com/inexio/snmpsim-restapi-go-client v0.0.0-20200414104837-83f8f76352de
 	github.com/rs/zerolog v1.18.0
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/viper v1.6.2

go.sum

@@ -17,6 +17,7 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
@@ -50,8 +51,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/inexio/snmpsim-restapi-go-client v0.0.0-20200311131246-b484400d0e35 h1:adCxMQCFIdvJ6UAvQWDxqN+FA/zAAwITAxbVvTNsqFQ=
-github.com/inexio/snmpsim-restapi-go-client v0.0.0-20200311131246-b484400d0e35/go.mod h1:LcMZvVsZoVd7g2gkHd4B1ZQTNdS1/71RPm7ejPL7TJY=
+github.com/inexio/snmpsim-restapi-go-client v0.0.0-20200414104837-83f8f76352de h1:Mn1wZ6MAqyHVK3+0BasqnWEEqnyUzvwqzZ57K7xByOI=
+github.com/inexio/snmpsim-restapi-go-client v0.0.0-20200414104837-83f8f76352de/go.mod h1:LcMZvVsZoVd7g2gkHd4B1ZQTNdS1/71RPm7ejPL7TJY=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=

snmpsim/cmd/createSubcommands/createAgent.go

@@ -81,7 +81,7 @@ var CreateAgentCmd = &cobra.Command{
 		}
 
 		fmt.Println("Successfully created agent.")
-		fmt.Println("Id:", agent.Id)
+		fmt.Println("Id:", agent.ID)
 
 		//Add agent to lab (if lab flag is set)
 		if cmd.Flag("lab").Changed {
@@ -102,13 +102,13 @@ var CreateAgentCmd = &cobra.Command{
 			}
 
 			//Add agent to lab
-			err = client.AddAgentToLab(labID, agent.Id)
+			err = client.AddAgentToLab(labID, agent.ID)
 			if err != nil {
 				log.Error().
 					Msg("Error while adding agent to lab")
 				os.Exit(1)
 			}
-			fmt.Println("Successfully added agent", agent.Id, "to lab", labID)
+			fmt.Println("Successfully added agent", agent.ID, "to lab", labID)
 		}
 	},
 }

snmpsim/cmd/createSubcommands/createEndpoint.go

@@ -82,7 +82,7 @@ var CreateEndpointCmd = &cobra.Command{
 		}
 
 		fmt.Println("Endpoint has been created successfully.")
-		fmt.Println("Id:", endpoint.Id)
+		fmt.Println("Id:", endpoint.ID)
 
 		//Add endpoint to engine (if engine flag is set)
 		if cmd.Flag("engine").Changed {
@@ -103,13 +103,13 @@ var CreateEndpointCmd = &cobra.Command{
 			}
 
 			//Add endpoint to engine
-			err = client.AddEndpointToEngine(engineID, endpoint.Id)
+			err = client.AddEndpointToEngine(engineID, endpoint.ID)
 			if err != nil {
 				log.Error().
 					Msg("Error while adding endpoint to engine")
 				os.Exit(1)
 			}
-			fmt.Println("Successfully added endpoint", endpoint.Id, "to engine", engineID)
+			fmt.Println("Successfully added endpoint", endpoint.ID, "to engine", engineID)
 		}
 	},
 }

snmpsim/cmd/createSubcommands/createEngine.go

@@ -81,7 +81,7 @@ var CreateEngineCmd = &cobra.Command{
 		}
 
 		fmt.Println("Engine has been created successfully.")
-		fmt.Println("Id:", engine.Id)
+		fmt.Println("Id:", engine.ID)
 
 		//Add engine to agent (if agent flag is set)
 		if cmd.Flag("agent").Changed {
@@ -102,13 +102,13 @@ var CreateEngineCmd = &cobra.Command{
 			}
 
 			//Add engine to agent
-			err = client.AddEngineToAgent(agentID, engine.Id)
+			err = client.AddEngineToAgent(agentID, engine.ID)
 			if err != nil {
 				log.Error().
 					Msg("Error while adding engine to agent")
 				os.Exit(1)
 			}
-			fmt.Println("Successfully added engine", engine.Id, "to agent ", agentID)
+			fmt.Println("Successfully added engine", engine.ID, "to agent ", agentID)
 		}
 	},
 }

snmpsim/cmd/createSubcommands/createLab.go

@@ -80,7 +80,7 @@ var CreateLabCmd = &cobra.Command{
 		}
 
 		fmt.Println("Lab has been created successfully.")
-		fmt.Println("Id:", lab.Id)
+		fmt.Println("Id:", lab.ID)
 	},
 }
 

snmpsim/cmd/createSubcommands/createTag.go

@@ -49,7 +49,7 @@ var CreateTagCmd = &cobra.Command{
 		}
 
 		fmt.Println("Tag has been created successfully.")
-		fmt.Println("Id:", tag.Id)
+		fmt.Println("Id:", tag.ID)
 	},
 }
 

snmpsim/cmd/createSubcommands/createUser.go

@@ -85,7 +85,7 @@ var CreateUserCmd = &cobra.Command{
 		}
 
 		fmt.Println("User has been created successfully.")
-		fmt.Println("Id:", user.Id)
+		fmt.Println("Id:", user.ID)
 
 		//Add user to engine (if engine flag is set)
 		if cmd.Flag("engine").Changed {
@@ -106,13 +106,13 @@ var CreateUserCmd = &cobra.Command{
 			}
 
 			//Add user to engine
-			err = client.AddUserToEngine(engineID, user.Id)
+			err = client.AddUserToEngine(engineID, user.ID)
 			if err != nil {
 				log.Error().
 					Msg("Error while adding user to engine")
 				os.Exit(1)
 			}
-			fmt.Println("Successfully added user", user.Id, "to engine", engineID)
+			fmt.Println("Successfully added user", user.ID, "to engine", engineID)
 		}
 	},
 }

snmpsim/cmd/deleteSubcommands/deleteTaggedObjects.go

@@ -52,6 +52,6 @@ var DeleteTaggedObjectsCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		fmt.Println("All Objects tagged with", tag.Name, "(Id:", tag.Id, ") were deleted successfully.")
+		fmt.Println("All Objects tagged with", tag.Name, "(Id:", tag.ID, ") were deleted successfully.")
 	},
 }

snmpsim/cmd/setup-env.go

@@ -86,16 +86,16 @@ When invoked with '--env-config' flag it can read the data contained in the give
 
 			//Create the environment according to the config
 			for _, lab := range environment.Labs {
-				labID := createObject("lab", tag.Id, lab.Name)
+				labID := createObject("lab", tag.ID, lab.Name)
 				for _, agent := range lab.Agents {
-					agentID := createObject("agent", tag.Id, agent.Name, agent.DataDir, strconv.Itoa(labID))
+					agentID := createObject("agent", tag.ID, agent.Name, agent.DataDir, strconv.Itoa(labID))
 					for _, engine := range agent.Engines {
-						engineID := createObject("engine", tag.Id, engine.Name, engine.engineID, strconv.Itoa(agentID))
+						engineID := createObject("engine", tag.ID, engine.Name, engine.engineID, strconv.Itoa(agentID))
 						for _, endpoint := range engine.Endpoints {
-							createObject("endpoint", tag.Id, endpoint.Name, endpoint.Address, endpoint.Protocol, strconv.Itoa(engineID))
+							createObject("endpoint", tag.ID, endpoint.Name, endpoint.Address, endpoint.Protocol, strconv.Itoa(engineID))
 						}
 						for _, user := range engine.Users {
-							createObject("user", tag.Id, user.Name, user.User, user.AuthKey, user.AuthProto, user.PrivKey, user.PrivProto, strconv.Itoa(engineID))
+							createObject("user", tag.ID, user.Name, user.User, user.AuthKey, user.AuthProto, user.PrivKey, user.PrivProto, strconv.Itoa(engineID))
 						}
 					}
 				}
@@ -137,13 +137,13 @@ When invoked with '--env-config' flag it can read the data contained in the give
 			}
 
 			for _, object := range objects {
-				createObjects(object, objectFields[object], tag.Id)
+				createObjects(object, objectFields[object], tag.ID)
 			}
 		}
 
 		fmt.Print("\n")
 		fmt.Println("Environment", tag.Name, "has been created successfully.")
-		fmt.Println("Id", tag.Id)
+		fmt.Println("Id", tag.ID)
 	},
 }
 
@@ -253,8 +253,8 @@ func createObject(objectType string, tagID int, args ...string) int {
 				Msg("Error while creating lab")
 			os.Exit(1)
 		}
-		fmt.Println("Lab", args[0], "has been created with the id", lab.Id)
-		id = lab.Id
+		fmt.Println("Lab", args[0], "has been created with the id", lab.ID)
+		id = lab.ID
 	case "agent":
 		//Create a tagged agent
 		agent, err := client.CreateAgentWithTag(args[0], args[1], tagID)
@@ -263,7 +263,7 @@ func createObject(objectType string, tagID int, args ...string) int {
 				Msg("Error while creating agent")
 			os.Exit(1)
 		}
-		fmt.Println("Agent", args[0], "has been created with the id", agent.Id)
+		fmt.Println("Agent", args[0], "has been created with the id", agent.ID)
 
 		//Read in the lab-id
 		labID, err := strconv.Atoi(args[2])
@@ -274,14 +274,14 @@ func createObject(objectType string, tagID int, args ...string) int {
 		}
 
 		//Add the agent to the lab
-		err = client.AddAgentToLab(labID, agent.Id)
+		err = client.AddAgentToLab(labID, agent.ID)
 		if err != nil {
 			log.Error().
 				Msg("Error while adding agent to lab")
 			os.Exit(1)
 		}
-		fmt.Println("Agent", agent.Id, "has been added to lab", labID)
-		id = agent.Id
+		fmt.Println("Agent", agent.ID, "has been added to lab", labID)
+		id = agent.ID
 	case "engine":
 		//Create a tagged engine
 		engine, err := client.CreateEngineWithTag(args[0], args[1], tagID)
@@ -290,7 +290,7 @@ func createObject(objectType string, tagID int, args ...string) int {
 				Msg("Error while creating engine")
 			os.Exit(1)
 		}
-		fmt.Println("Engine", args[0], "has been created with the id", engine.Id)
+		fmt.Println("Engine", args[0], "has been created with the id", engine.ID)
 
 		//Read in the agent-id
 		agentID, err := strconv.Atoi(args[2])
@@ -301,14 +301,14 @@ func createObject(objectType string, tagID int, args ...string) int {
 		}
 
 		//Add the engine to the agent
-		err = client.AddEngineToAgent(agentID, engine.Id)
+		err = client.AddEngineToAgent(agentID, engine.ID)
 		if err != nil {
 			log.Error().
 				Msg("Error while adding engine to agent")
 			os.Exit(1)
 		}
-		fmt.Println("Engine", engine.Id, "has been added to agent", agentID)
-		id = engine.Id
+		fmt.Println("Engine", engine.ID, "has been added to agent", agentID)
+		id = engine.ID
 	case "endpoint":
 		//Create a tagged endpoint
 		endpoint, err := client.CreateEndpointWithTag(args[0], args[1], args[2], tagID)
@@ -317,7 +317,7 @@ func createObject(objectType string, tagID int, args ...string) int {
 				Msg("Error while creating endpoint")
 			os.Exit(1)
 		}
-		fmt.Println("Endpoint", args[0], "has been created with the id", endpoint.Id)
+		fmt.Println("Endpoint", args[0], "has been created with the id", endpoint.ID)
 
 		//Read in the engine-id
 		engineID, err := strconv.Atoi(args[3])
@@ -328,14 +328,14 @@ func createObject(objectType string, tagID int, args ...string) int {
 		}
 
 		//Add the endpoint to the engine
-		err = client.AddEndpointToEngine(engineID, endpoint.Id)
+		err = client.AddEndpointToEngine(engineID, endpoint.ID)
 		if err != nil {
 			log.Error().
 				Msg("Error while adding endpoint to engine")
 			os.Exit(1)
 		}
-		fmt.Println("Endpoint", endpoint.Id, "has been added to engine", engineID)
-		id = endpoint.Id
+		fmt.Println("Endpoint", endpoint.ID, "has been added to engine", engineID)
+		id = endpoint.ID
 	case "user":
 		//Create a tagged user
 		user, err := client.CreateUserWithTag(args[0], args[1], args[2], args[3], args[4], args[5], tagID)
@@ -344,7 +344,7 @@ func createObject(objectType string, tagID int, args ...string) int {
 				Msg("Error while creating user")
 			os.Exit(1)
 		}
-		fmt.Println("User", args[0], "has been created with the id", user.Id)
+		fmt.Println("User", args[0], "has been created with the id", user.ID)
 
 		//Read in the engine-id
 		engineID, err := strconv.Atoi(args[6])
@@ -355,14 +355,14 @@ func createObject(objectType string, tagID int, args ...string) int {
 		}
 
 		//Add the user to the engine
-		err = client.AddUserToEngine(engineID, user.Id)
+		err = client.AddUserToEngine(engineID, user.ID)
 		if err != nil {
 			log.Error().
 				Msg("Error while adding user to engine")
 			os.Exit(1)
 		}
-		fmt.Println("User", user.Id, "has been added to engine", engineID)
-		id = user.Id
+		fmt.Println("User", user.ID, "has been added to engine", engineID)
+		id = user.ID
 	default:
 		log.Debug().
 			Msg("Invalid object-type " + objectType)