gomesh: remove the network notion, multiple registry files must be used

Signed-off-by: Nagy Károly Gábriel <k@jpi.io>
karasz · Nov 24, 2022 · 84550de · 84550de
1 parent 9a11bb1
commit 84550de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/cmd/generate.go b/cmd/generate.go
@@ -35,11 +35,10 @@ var generateCmd = &cobra.Command{
 	Long:  `Generate will create the configs file in the specified folder`,
 	Run: func(cmd *cobra.Command, args []string) {
 		out, _ := cmd.Flags().GetString("output")
-		id, _ := cmd.Flags().GetInt("network_id")
 		peername, _ := cmd.Flags().GetString("peer_name")
 		usestdout, _ := cmd.Flags().GetBool("useStdOut")
 		wireguard.SetOutput(usestdout)
-		err := thePeers.GenerateConfigs(out, id, peername)
+		err := thePeers.GenerateConfigs(out, peername)
 		if err != nil {
 			fmt.Println("generate", err)
 		}
@@ -48,7 +47,6 @@ var generateCmd = &cobra.Command{
 
 func init() {
 	generateCmd.Flags().StringP("output", "o", "output", "Directory where to output configs.")
-	generateCmd.Flags().IntP("network_id", "i", 0, "ID of the network to generate")
 	generateCmd.Flags().StringP("peer_name", "p", "", "Generate config for this peer")
 	generateCmd.Flags().BoolP("useStdOut", "s", false, "Use StdOut instead of files")
 	rootCmd.AddCommand(generateCmd)

diff --git a/wireguard/peers.go b/wireguard/peers.go
@@ -138,26 +138,26 @@ func (p Peers) DeletePeer(pr string) {
 
 //GenerateConfigs will generate the Wireguard mesh
 //configs in the specified folder
-func (p Peers) GenerateConfigs(folder string, id int, peername string) error {
+func (p Peers) GenerateConfigs(folder string, peername string) error {
 	var err error
 	if err = os.MkdirAll(folder, 0775); err != nil {
 		return err
 	}
 	if peername == "" {
 		for i := range p {
-			err = p.dumpConfig(p[i], folder, id)
+			err = p.dumpConfig(p[i], folder)
 		}
 	} else {
 		for j := range p {
 			if p[j].Name == peername {
-				err = p.dumpConfig(p[j], folder, id)
+				err = p.dumpConfig(p[j], folder)
 			}
 		}
 	}
 	return err
 }
 
-func (p Peers) dumpConfig(pr Peer, folder string, id int) error {
+func (p Peers) dumpConfig(pr Peer, folder string) error {
 	var err error
 	var b strings.Builder
 
@@ -186,7 +186,7 @@ func (p Peers) dumpConfig(pr Peer, folder string, id int) error {
 
 	}
 	if !useStdOut {
-		configFile := folder + "/" + pr.Name + "_wg" + fmt.Sprintf("%d", id) + ".conf"
+		configFile := folder + "/" + pr.Name + ".conf"
 		f, err := os.OpenFile(configFile, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
 		if err != nil {
 			return err