Merge pull request #1288 from mrpalide/fix/conf-service-caching-issue

fix caching issue

cmd/skywire-cli/commands/config/gen.go

@@ -26,7 +26,7 @@ func init() {
 	genConfigCmd.Flags().SortFlags = false
 	RootCmd.AddCommand(genConfigCmd)
 
-	genConfigCmd.Flags().StringVarP(&serviceConfURL, "url", "a", svcconf, "services conf")
+	genConfigCmd.Flags().StringVarP(&serviceConfURL, "url", "a", "", "services conf")
 	ghiddenflags = append(ghiddenflags, "url")
 	genConfigCmd.Flags().StringVar(&logLevel, "log-level", "info", "level of logging in config")
 	ghiddenflags = append(ghiddenflags, "log-level")
@@ -217,6 +217,7 @@ var genConfigCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		mLog := logging.NewMasterLogger()
 		mLog.SetLevel(logrus.InfoLevel)
+		serviceConfURL = svcconf
 		//use test deployment
 		if testEnv {
 			serviceConfURL = testconf

go.mod

@@ -47,7 +47,7 @@ require (
 	github.com/go-chi/chi/v5 v5.0.8-0.20220103230436-7dbe9a0bd10f
 	github.com/ivanpirog/coloredcobra v1.0.0
 	github.com/james-barrow/golang-ipc v0.0.0-20210227130457-95e7cc81f5e2
-	github.com/skycoin/skywire-utilities v0.0.0-20220630144749-6ea8913bf1e8
+	github.com/skycoin/skywire-utilities v0.0.0-20220706133229-02cc62ac2323
 	github.com/skycoin/systray v1.10.1-0.20220630135132-48d2a1fb85d8
 )
 

go.sum

@@ -485,6 +485,8 @@ github.com/skycoin/skycoin v0.27.1/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63f
 github.com/skycoin/skywire-utilities v0.0.0-20220617085111-5c8c8d3ced14/go.mod h1:B63p56igl38Ha+zjqi26d2om6XEe9jozwB6kzAWMnm0=
 github.com/skycoin/skywire-utilities v0.0.0-20220630144749-6ea8913bf1e8 h1:xUPi4duqObtDt4BYiNhbwssiUOFTor67Nftqx1F6/uc=
 github.com/skycoin/skywire-utilities v0.0.0-20220630144749-6ea8913bf1e8/go.mod h1:B63p56igl38Ha+zjqi26d2om6XEe9jozwB6kzAWMnm0=
+github.com/skycoin/skywire-utilities v0.0.0-20220706133229-02cc62ac2323 h1:W+LSTySKEg3/UyVZXziQYyIdIo66g28VuKBk7sl0718=
+github.com/skycoin/skywire-utilities v0.0.0-20220706133229-02cc62ac2323/go.mod h1:B63p56igl38Ha+zjqi26d2om6XEe9jozwB6kzAWMnm0=
 github.com/skycoin/systray v1.10.1-0.20220630135132-48d2a1fb85d8 h1:2IA2Iw6rgNpbd/rogzBbmNpfGLPhf9zYE68RY8CmU4k=
 github.com/skycoin/systray v1.10.1-0.20220630135132-48d2a1fb85d8/go.mod h1:nsO0LzaKDTG2m9xVm8GPtg7dEx+pP1cZ7GpO+PSLzlo=
 github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f h1:A5dEM1OE9YhN3LciZU9qPjo7fJ46JeHNi3JCroDkK0Y=

pkg/visor/visorconfig/services.go

@@ -24,6 +24,7 @@ func Fetch(mLog *logging.MasterLogger, serviceConfURL string, stdout bool) (serv
 	if err != nil {
 		mLog.WithError(err).Fatal("Failed to create http request\n")
 	}
+	req.Header.Add("Cache-Control", "no-cache")
 	//check for errors in the response
 	res, err := client.Do(req)
 	if err != nil {

scripts/win_installer/Product.wxs

@@ -16,8 +16,8 @@
             Language="1033">
 
       <Package InstallerVersion="200" Compressed="yes" Comments="Windows Installer Package" InstallScope="perMachine"/>
-      <WixVariable Id="WixUIBannerBmp" Value=".\images\Banner.bmp" />
-      <WixVariable Id="WixUIDialogBmp" Value=".\images\Dialog.bmp" />
+      <WixVariable Id="WixUIBannerBmp" Value=".\images\Banner.png" />
+      <WixVariable Id="WixUIDialogBmp" Value=".\images\Dialog.png" />
       <Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
 
       <Upgrade Id="cd7955bc-304e-470f-9c24-eb9f429a8085">