Commit e2f4a628 authored by Muhammad Umair Khan's avatar Muhammad Umair Khan
Browse files

fix: resolve govet and formatting errors in meepctl

parent 66f69e86

go-apps/meepctl/cmd/build.go

+40 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import ( 
	"os"

	"os/exec"

	"sort"

	"strings"

	"time"



	"github.com/InterDigitalInc/AdvantEDGE/go-apps/meepctl/utils"
@@ -180,6 +181,38 @@ func buildFrontend(targetName string, repo string, cobraCmd *cobra.Command) { 
	srcDir := gitDir + "/" + target["src"]

	binDir := gitDir + "/" + target["bin"]

	lintEnabled := utils.RepoCfg.GetBool(repo + targetName + ".lint")

	locDeps := utils.RepoCfg.GetStringMapString(repo + targetName + ".local-deps")



	// Checksum optimization

	binDirExists := false

	if _, err := os.Stat(binDir); !os.IsNotExist(err) {

		binDirExists = true

	}



	checksumFile := srcDir + "/.build_checksum"

	findArgs := srcDir

	for _, depDir := range locDeps {

		findArgs += " " + gitDir + "/" + depDir

	}



	cmdStr := fmt.Sprintf("find %s -type f -not -name '.build_checksum' -not -path '*/node_modules/*' -not -path '*/dist/*' -not -path '*/bin/*' -not -path '*/.git/*' 2>/dev/null | sort | xargs md5sum 2>/dev/null | md5sum | cut -d' ' -f1", findArgs)

	checksumCmd := exec.Command("sh", "-c", cmdStr)

	outBytes, err := checksumCmd.Output()

	currentChecksum := ""

	if err == nil {

		currentChecksum = strings.TrimSpace(string(outBytes))



		if binDirExists && currentChecksum != "" {

			savedChecksumBytes, err := os.ReadFile(checksumFile)

			if err == nil {

				savedChecksum := strings.TrimSpace(string(savedChecksumBytes))

				if currentChecksum == savedChecksum {

					fmt.Println(utils.FormatStep("   + skipping build (no changes detected)"))

					return

				}

			}

		}

	}



	// dependencies

	fmt.Println(utils.FormatStep("   + checking external dependencies"))
@@ -191,7 +224,6 @@ func buildFrontend(targetName string, repo string, cobraCmd *cobra.Command) { 
		fmt.Println(out)

	}



	locDeps := utils.RepoCfg.GetStringMapString(repo + targetName + ".local-deps")

	if len(locDeps) > 0 {

		fmt.Println(utils.FormatStep("   + checking local dependencies"))

		for dep, depDir := range locDeps {
@@ -240,6 +272,13 @@ func buildFrontend(targetName string, repo string, cobraCmd *cobra.Command) { 
	if err != nil {

		fmt.Println(utils.FormatError("Error: " + err.Error()))

		fmt.Println(out)

	} else {

		if currentChecksum != "" {

			err = os.WriteFile(checksumFile, []byte(currentChecksum), 0644)

			if err != nil {

				fmt.Println(utils.FormatError("Error saving checksum: " + err.Error()))

			}

		}

	}

}

go-apps/meepctl/go.mod

+23 −4
Original line number Diff line number Diff line 
module github.com/InterDigitalInc/AdvantEDGE/go-apps/meepctl



go 1.12

go 1.20



require (

	github.com/BurntSushi/toml v0.3.1 // indirect

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client v0.0.0

	github.com/cpuguy83/go-md2man v1.0.10 // indirect

	github.com/ghodss/yaml v1.0.0

	github.com/inconshreveable/mousetrap v1.0.0 // indirect

	github.com/mitchellh/go-homedir v1.1.0

	github.com/roymx/viper v1.3.3-0.20190416163942-b9a223fc58a3

	github.com/spf13/cobra v0.0.0-20190109003409-7547e83b2d85

	gopkg.in/yaml.v2 v2.2.2

)



require (

	github.com/BurntSushi/toml v0.3.1 // indirect

	github.com/antihax/optional v1.0.0 // indirect

	github.com/cpuguy83/go-md2man v1.0.10 // indirect

	github.com/fsnotify/fsnotify v1.4.7 // indirect

	github.com/golang/protobuf v1.2.0 // indirect

	github.com/inconshreveable/mousetrap v1.0.0 // indirect

	github.com/magiconair/properties v1.8.0 // indirect

	github.com/mitchellh/mapstructure v1.1.2 // indirect

	github.com/pelletier/go-toml v1.2.0 // indirect

	github.com/russross/blackfriday v1.5.2 // indirect

	github.com/spf13/afero v1.1.2 // indirect

	github.com/spf13/cast v1.3.0 // indirect

	github.com/spf13/jwalterweatherman v1.0.0 // indirect

	github.com/spf13/pflag v1.0.3 // indirect

	golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e // indirect

	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect

	golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a // indirect

	golang.org/x/text v0.3.0 // indirect

	google.golang.org/appengine v1.4.0 // indirect

)



replace github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-sandbox-ctrl-client => ../../go-packages/meep-sandbox-ctrl-client

go-apps/meepctl/go.sum

+6 −0
Original line number Diff line number Diff line 
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=

github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=

github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=

github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -8,6 +9,7 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz 
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=

github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=

github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=

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/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=

github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -25,6 +27,7 @@ github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQz 
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=

github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=

github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

github.com/roymx/viper v1.3.3-0.20190416163942-b9a223fc58a3 h1:lBNvYUFo7d4fHs8BXUmoTzbdUo4usq6PlP5qn894sGA=

github.com/roymx/viper v1.3.3-0.20190416163942-b9a223fc58a3/go.mod h1:jo59Sv6xirZtbxbaZbCtrQd1CSufmcxJZIC8hm2tepw=
@@ -40,6 +43,7 @@ github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9 
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=

github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=

github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=

github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=

github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=

github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=

github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
@@ -49,6 +53,7 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI 
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=

golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=

golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a h1:1n5lsVfiQW3yfsRGu98756EH1YthsFqr/5mxHduZW2A=

golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -56,6 +61,7 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= 
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=

google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=

gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=