Skip to content
This repository has been archived by the owner on Oct 23, 2023. It is now read-only.

fix(snap): Refactor to avoid conflicts with readonly config provider directory #51

Merged
merged 3 commits into from
Mar 21, 2023
Merged

fix(snap): Refactor to avoid conflicts with readonly config provider directory #51

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abde226
fix(snap): Refactor to avoid conflicts with readonly config provider …
MonicaisHer Mar 17, 2023
b1d763c
Update config interface slot name, and app name
MonicaisHer Mar 20, 2023
2f8a2c4
Enable xtrace, update env file path
MonicaisHer Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions snap/local/bin/source-env-file.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash -e
#!/bin/bash -ex
MonicaisHer marked this conversation as resolved.
Show resolved Hide resolved

SERVICE="kuiperd"
SERVICE_ENV="$SNAP_DATA/config/$SERVICE/res/$SERVICE.env"
ENV_FILE="$SNAP_DATA/config/$SERVICE/res/overrides.env"
MonicaisHer marked this conversation as resolved.
Show resolved Hide resolved
TAG="$SNAP_INSTANCE_NAME."$(basename "$0")

if [ -f "$SERVICE_ENV" ]; then
logger --tag=$TAG "Sourcing $SERVICE_ENV"
if [ -f "$ENV_FILE" ]; then
logger --tag=$TAG "Sourcing $ENV_FILE"
set -o allexport
source "$SERVICE_ENV" set
source "$ENV_FILE" set
set +o allexport
fi

Expand Down
2 changes: 0 additions & 2 deletions snap/local/helper-go/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ import (
)

func configure() {
const app = "kuiperd"

log.SetComponentName("configure")

options.EnableConfigHierarchy()
Expand Down
2 changes: 1 addition & 1 deletion snap/local/helper-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module github.com/canonical/edgex-ekuiper-snap/snap/local/helper-go

go 1.18

require github.com/canonical/edgex-snap-hooks/v3 v3.0.0-20230112170125-c0580fb68dab
require github.com/canonical/edgex-snap-hooks/v3 v3.0.0-20230315153603-544c6823a1b0
2 changes: 2 additions & 0 deletions snap/local/helper-go/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
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/canonical/edgex-snap-hooks/v3 v3.0.0-20230315153603-544c6823a1b0 h1:h2C5W3mEC5g/s9W/mwh7X/3uSqKjNln/xHP41i8Mw/M=
github.com/canonical/edgex-snap-hooks/v3 v3.0.0-20230315153603-544c6823a1b0/go.mod h1:qGZwprCZGZk2pA9BrleUtSrGrfHIaIz1356p8aqzuN4=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
Expand Down
12 changes: 10 additions & 2 deletions snap/local/helper-go/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
hooks "github.com/canonical/edgex-snap-hooks/v3"
"github.com/canonical/edgex-snap-hooks/v3/env"
"github.com/canonical/edgex-snap-hooks/v3/log"
"github.com/canonical/edgex-snap-hooks/v3/snapctl"
)

// installConfig copies all config files from $SNAP to $SNAP_DATA.
Expand All @@ -39,7 +40,14 @@ func installConfig() error {
func install() {
log.SetComponentName("install")

if err := installConfig(); err != nil {
log.Fatalf("Error installing config files: %s", err)
// Install default config files only if no config provider is connected
isConnected, err := snapctl.IsConnected(app + "-config").Run()
MonicaisHer marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
log.Fatalf("Error checking interface connection: %s", err)
}
if !isConnected {
if err := installConfig(); err != nil {
log.Fatalf("Error installing config files: %s", err)
}
}
}
2 changes: 2 additions & 0 deletions snap/local/helper-go/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import (
"os"
)

const app = "kuiperd"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having a global variable called app is confusing because this snap has two apps.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has been updated to const daemonApp = "kuiperd".

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My comment was about the confusion in name when set as a global variable in main.go, not the local variable in configure(), but it is a good improvement in general.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so would you like me to keep it as a local variable?


func main() {
subCommand := os.Args[1]
switch subCommand {
Expand Down