send command fully working

Author: creativeprojects

config/remote .go renamed to config/remote.go

@@ -10,6 +10,7 @@ type Remote struct {
 	KnownHostsPath    string   `mapstructure:"known-hosts" description:"Path to the known hosts file"`
 	BinaryPath        string   `mapstructure:"binary-path" description:"Path to the resticprofile binary to use on the remote client"`
 	ConfigurationFile string   `mapstructure:"configuration-file" description:"Path to the configuration file to transfer to the remote client"`
+	ProfileName       string   `mapstructure:"profile-name" description:"Name of the profile to use on the remote client"`
 	SendFiles         []string `mapstructure:"send-files" description:"Other configuration files to transfer to the remote client"`
 }
 

examples/linux.yaml

@@ -101,9 +101,9 @@ src:
         run-after: echo All Done!
         run-before:
             - echo Starting!
-            - ls -al ~/go
+            - ls -al ~/go/src/github.com/creativeprojects/resticprofile
         source:
-            - ~/go
+            - ~/go/src/github.com/creativeprojects/resticprofile
         tag:
             - test
             - dev

main.go

@@ -143,7 +143,7 @@ func main() {
 	banner()
 
 	if flags.remote != "" {
-		closeFS, err := setupRemoteConfiguration(flags.remote)
+		closeFS, remoteParameters, err := setupRemoteConfiguration(flags.remote)
 		if err != nil {
 			// need to setup console logging to display the error message
 			closeLogger := setupLogging(nil)
@@ -152,6 +152,13 @@ func main() {
 			exitCode = constants.ExitCannotSetupRemoteConfiguration
 			return
 		}
+		if flags.config == constants.DefaultConfigurationFile && remoteParameters.ConfigurationFile != "" {
+			flags.config = remoteParameters.ConfigurationFile
+		}
+		if flags.name == constants.DefaultProfileName && remoteParameters.ProfileName != "" {
+			flags.name = remoteParameters.ProfileName
+		}
+		flags.resticArgs = remoteParameters.CommandLineArguments
 		shutdown.AddHook(closeFS)
 	}
 
@@ -287,29 +294,18 @@ func main() {
 }
 
 func banner() {
-	clog.Debugf("resticprofile %s compiled with %s", version, runtime.Version())
+	clog.Debugf(
+		"resticprofile %s compiled with %s %s/%s",
+		version,
+		runtime.Version(),
+		runtime.GOOS,
+		runtime.GOARCH,
+	)
 }
 
 func loadConfig(flags commandLineFlags, silent bool) (cfg *config.Config, global *config.Global, err error) {
 	fs := afero.NewOsFs()
 
-	// if flags.remote != "" {
-	// 	// fs = afero.NewMemMapFs()
-	// 	// parameters, err := loadRemoteConfiguration(fs, flags.remote)
-	// 	os.Chdir()
-	// 	_, parameters, err := loadRemoteFiles(flags.remote)
-	// 	if err != nil {
-	// 		return nil, nil, fmt.Errorf("cannot load remote configuration: %w", err)
-	// 	}
-	// 	// we should probably move this to the context (and keep flags intact)
-	// 	if flags.config == constants.DefaultConfigurationFile {
-	// 		flags.config = parameters.ConfigurationFile
-	// 	}
-	// 	if flags.name == constants.DefaultProfileName {
-	// 		flags.name = parameters.ProfileName
-	// 	}
-	// }
-
 	var configFile string
 	if configFile, err = filesearch.FindConfigurationFile(fs, flags.config); err == nil {
 		if configFile != flags.config && !silent {

own_commands.go

@@ -65,7 +65,7 @@ func (o *OwnCommands) Run(ctx *Context) error {
 		return fmt.Errorf("command not found: %v", ctx.request.command)
 	}
 	if command.experimental {
-		clog.Warning("this command is experimental and its behaviour may change in the future")
+		clog.Warningf("%s: this command is experimental and its behaviour may change in the future", ctx.request.command)
 	}
 	return command.action(os.Stdout, commandContext{
 		ownCommands: o,

remote.go

@@ -91,10 +91,10 @@ func getManifestParameters(reader io.Reader) (*remote.Manifest, error) {
 }
 
 // setupRemoteConfiguration downloads the configuration files from the remote endpoint and mounts the virtual FS
-func setupRemoteConfiguration(remoteEndpoint string) (func(), error) {
+func setupRemoteConfiguration(remoteEndpoint string) (func(), *remote.Manifest, error) {
 	files, parameters, err := loadRemoteFiles(remoteEndpoint)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	closeMountpoint := func() {}
@@ -111,15 +111,26 @@ func setupRemoteConfiguration(remoteEndpoint string) (func(), error) {
 	}
 	err = os.MkdirAll(mountpoint, 0o755)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create mount directory: %w", err)
+		return nil, parameters, fmt.Errorf("failed to create mount directory: %w", err)
 	}
 
 	closeFs, err := fuse.MountFS(mountpoint, files)
 	if err != nil {
-		return closeMountpoint, err
+		return closeMountpoint, parameters, err
 	}
+
+	wd, _ := os.Getwd()
+	err = os.Chdir(mountpoint)
+	if err != nil {
+		return func() {
+			closeFs()
+			closeMountpoint()
+		}, parameters, fmt.Errorf("failed to change directory: %w", err)
+	}
+
 	return func() {
+		_ = os.Chdir(wd)
 		closeFs()
 		closeMountpoint()
-	}, nil
+	}, parameters, nil
 }

send.go

@@ -29,7 +29,9 @@ func sendProfileCommand(w io.Writer, cmdCtx commandContext) error {
 	handler := http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
 		// prepare manifest file
 		manifest := remote.Manifest{
-			ConfigurationFile: path.Base(remoteConfig.ConfigurationFile), // need to take file path into consideration
+			ConfigurationFile:    path.Base(remoteConfig.ConfigurationFile), // need to take file path into consideration
+			ProfileName:          remoteConfig.ProfileName,
+			CommandLineArguments: cmdCtx.flags.resticArgs[2:],
 		}
 		manifestData, err := json.Marshal(manifest)
 		if err != nil {

serve.go

@@ -41,6 +41,7 @@ func serveCommand(w io.Writer, cmdCtx commandContext) error {
 		// prepare manifest file
 		manifest := remote.Manifest{
 			ConfigurationFile: path.Base(remoteConfig.ConfigurationFile), // need to take file path into consideration
+			ProfileName:       remoteConfig.ProfileName,
 		}
 		manifestData, err := json.Marshal(manifest)
 		if err != nil {