Merge pull request #4186 from farshidtz/snap-refactor-merge-hooks

refactor(snap): Merge snap hook packages

snap/hooks/configure

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec $SNAP/bin/helper-go configure

snap/hooks/install

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec $SNAP/bin/helper-go install

snap/local/helper-go/Makefile

@@ -0,0 +1,8 @@
+build:
+	go build -ldflags="-s -w" -o helper-go
+
+tidy:
+	go mod tidy
+
+clean:
+	rm -f helper-go

snap/local/hooks/cmd/configure/configure.go → snap/local/helper-go/configure.go

@@ -516,6 +516,9 @@ func checkSecurityConfig(services []string) ([]string, error) {
 }
 
 func configure() {
+	// process the EdgeX >=2.2 app options
+	processAppOptions()
+
 	var debug = false
 	var err error
 	var startServices []string

snap/local/hooks/go.mod → snap/local/helper-go/go.mod

@@ -1,5 +1,5 @@
-module github.com/canonical/edgex-go/hooks
-
-require github.com/canonical/edgex-snap-hooks/v2 v2.4.1
+module github.com/edgexfoundry/edgex-go/snap/local/helper-go
 
 go 1.18
+
+require github.com/canonical/edgex-snap-hooks/v2 v2.4.1

snap/local/hooks/cmd/install/install.go → snap/local/helper-go/install.go

@@ -29,8 +29,6 @@ import (
 	hooks "github.com/canonical/edgex-snap-hooks/v2"
 )
 
-var cli *hooks.CtlCli = hooks.NewSnapCtl()
-
 const secretStoreAddTokensCfg = "env.security-secret-store.add-secretstore-tokens"
 const secretStoreAddKnownSecretsCfg = "env.security-secret-store.add-known-secrets"
 const consulAddRegistryACLRolesCfg = "env.security-bootstrapper.add-registry-acl-roles"
@@ -325,7 +323,7 @@ func installRedis() error {
 	return nil
 }
 
-func main() {
+func install() {
 	var debug = false
 	var err error
 

snap/local/hooks/cmd/configure/main.go → snap/local/helper-go/main.go

@@ -25,21 +25,15 @@ import (
 var cli *hooks.CtlCli = hooks.NewSnapCtl()
 
 func main() {
-	// no subcommand, as called by snapd
-	if len(os.Args) == 1 {
-		// process the EdgeX >=2.2 snap options
-		processAppOptions()
-		// configure everything else, incl. the legacy snap options
-		configure()
-		return
-	}
-
 	subCommand := os.Args[1]
 	switch subCommand {
-	case "options":
-		// configure options
+	case "install": // snap install hook
+		install()
+	case "configure": // snap configure hook
+		configure()
+	case "options": // apply snap options to apps
 		options()
 	default:
-		panic("Unknown CLI sub-command: " + subCommand)
+		panic("Unknown subcommand: " + subCommand)
 	}
 }

snap/local/runtime-helpers/bin/security-proxy-post-setup.sh

@@ -10,7 +10,7 @@ export PATH="$SNAP/bin:$PATH"
 
 # Several config options depend on resources that only exist after proxy 
 # setup. This re-applies the config options logic after deferred startup:
-$SNAP/snap/hooks/configure options --service=security-proxy
+$SNAP/bin/helper-go options --service=security-proxy
 
 # Process the EdgeX >=2.2 snap options
-$SNAP/snap/hooks/configure options --service=secrets-config
+$SNAP/bin/helper-go options --service=secrets-config

snap/snapcraft.yaml

@@ -554,15 +554,14 @@ parts:
     plugin: dump
     source: snap/local/runtime-helpers
 
-  hooks:
-    source: snap/local/hooks
+  helper-go:
+    source: snap/local/helper-go
     plugin: make
     after: [go-build-helper]
     override-build: |
       cd $SNAPCRAFT_PART_SRC
       make build
-      install -DT ./cmd/configure/configure "$SNAPCRAFT_PART_INSTALL/snap/hooks/configure"
-      install -DT ./cmd/install/install "$SNAPCRAFT_PART_INSTALL/snap/hooks/install"
+      install -DT ./helper-go $SNAPCRAFT_PART_INSTALL/bin/helper-go
 
   consul:
     plugin: nil