refactor(snap): Refactor and upgrade to edgex-snap-hooks v3 (#587)

* refactor(snap): Upgrade to edgex-snap-hooks v3 * chore(snap): Remove obsolete screenshots * ci(snap): Add snap module to dependabot Signed-off-by: Farshid Tavakolizadeh <[email protected]>
edgexfoundry · Jan 13, 2023 · 5cbf8b5 · 5cbf8b5
1 parent 1fc6aad
commit 5cbf8b5
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 37 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,3 +5,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "gomod"
+    directory: "/snap/local/helper-go"
+    schedule:
+      interval: "daily"
diff --git a/snap/local/assets/ui-homepage.jpg b/snap/local/assets/ui-homepage.jpg
diff --git a/snap/local/assets/ui-login.jpg b/snap/local/assets/ui-login.jpg
diff --git a/snap/local/helper-go/configure.go b/snap/local/helper-go/configure.go
@@ -17,9 +17,8 @@
 package main
 
 import (
-	"github.com/canonical/edgex-snap-hooks/v2/log"
-	"github.com/canonical/edgex-snap-hooks/v2/options"
-	"github.com/canonical/edgex-snap-hooks/v2/snapctl"
+	"github.com/canonical/edgex-snap-hooks/v3/log"
+	"github.com/canonical/edgex-snap-hooks/v3/options"
 )
 
 // configure is called by the main function
@@ -28,22 +27,12 @@ func configure() {
 
 	log.SetComponentName("configure")
 
-	log.Info("Enabling config options")
-	err := snapctl.Set("app-options", "true").Run()
-	if err != nil {
-		log.Fatalf("Could not enable config options: %v", err)
+	if err := options.ProcessConfig(app); err != nil {
+		log.Fatalf("Error processing config options: %v", err)
 	}
 
-	log.Info("Processing config options")
-	err = options.ProcessConfig(app)
-	if err != nil {
-		log.Fatalf("Could not process config options: %v", err)
-	}
-
-	log.Info("Processing autostart options")
-	err = options.ProcessAutostart(app)
-	if err != nil {
-		log.Fatalf("Could not process autostart options: %v", err)
+	if err := options.ProcessAutostart(app); err != nil {
+		log.Fatalf("Error processing autostart options: %v", err)
 	}
 
 }
diff --git a/snap/local/helper-go/go.mod b/snap/local/helper-go/go.mod
@@ -1,5 +1,5 @@
-module github.com/edgexfoundry/device-virtual-go/hooks
+module github.com/edgexfoundry/edgex-ui-go/snap/local/helper-go
 
 go 1.18
 
-require github.com/canonical/edgex-snap-hooks/v2 v2.4.1
+require github.com/canonical/edgex-snap-hooks/v3 v3.0.0-20230112170125-c0580fb68dab
diff --git a/snap/local/helper-go/go.sum b/snap/local/helper-go/go.sum
@@ -1,16 +1,6 @@
-github.com/canonical/edgex-snap-hooks/v2 v2.4.1 h1:TFFF/mHkYTmUd040N8S4q/mp78CUZr1W3Cxx4uRpfOg=
-github.com/canonical/edgex-snap-hooks/v2 v2.4.1/go.mod h1:8mjUKSAFNsXYvV0fcfOoYue1dSjTVeJYdaQYtA6pb6Y=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/canonical/edgex-snap-hooks/v3 v3.0.0-20230112170125-c0580fb68dab h1:wpiKN0hX8tqeZNa4jPvgyrqP8ixm1Xu7lcQA3bypR7w=
+github.com/canonical/edgex-snap-hooks/v3 v3.0.0-20230112170125-c0580fb68dab/go.mod h1:RvJ48YbdBPZn7L8OcylOpKIlIJD+nMjo5D7WSnPYusY=
 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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/snap/local/helper-go/install.go b/snap/local/helper-go/install.go
@@ -17,9 +17,9 @@
 package main
 
 import (
-	hooks "github.com/canonical/edgex-snap-hooks/v2"
-	"github.com/canonical/edgex-snap-hooks/v2/env"
-	"github.com/canonical/edgex-snap-hooks/v2/log"
+	hooks "github.com/canonical/edgex-snap-hooks/v3"
+	"github.com/canonical/edgex-snap-hooks/v3/env"
+	"github.com/canonical/edgex-snap-hooks/v3/log"
 )
 
 func installConfig() error {
@@ -38,8 +38,7 @@ func installConfig() error {
 func install() {
 	log.SetComponentName("install")
 
-	err := installConfig()
-	if err != nil {
+	if err := installConfig(); err != nil {
 		log.Fatalf("Error installing config file: %s", err)
 	}
 }