Minors

wttech · Sep 16, 2023 · 43fe2ce · 43fe2ce
1 parent 498a9c9
commit 43fe2ce
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/cmd/aem/file.go b/cmd/aem/file.go
@@ -82,7 +82,7 @@ func (c *CLI) fileDownloadCmd() *cobra.Command {
 	}
 	cmd.Flags().String("url", "", "Source file URL")
 	_ = cmd.MarkFlagRequired("url")
-	cmd.Flags().String("file", "", "Destination file path")
+	cmd.Flags().String("file", "", "Local file path")
 	_ = cmd.MarkFlagRequired("file")
 	cmd.Flags().String("auth-basic", "", "Basic Authorization (in format 'user:password')")
 	cmd.Flags().String("auth-token", "", "Token Authorization")

diff --git a/cmd/aem/package.go b/cmd/aem/package.go
@@ -440,14 +440,14 @@ func (c *CLI) pkgBuildCmd() *cobra.Command {
 
 func pkgDefineFlags(cmd *cobra.Command) {
 	cmd.Flags().String("pid", "", "ID (group:name:version)'")
-	cmd.Flags().String("file", "", "Local path on file system")
-	cmd.Flags().String("path", "", "Remote path on AEM repository")
+	cmd.Flags().String("file", "", "Local file path")
+	cmd.Flags().String("path", "", "Remote repository path")
 	cmd.MarkFlagsMutuallyExclusive("pid", "file", "path")
 }
 
 func pkgDefineDownloadFlags(cmd *cobra.Command) {
 	cmd.Flags().String("pid", "", "ID (group:name:version)'")
-	cmd.Flags().String("path", "", "Remote path on AEM repository")
+	cmd.Flags().String("path", "", "Remote repository path")
 	cmd.Flags().StringP("target-file", "t", "", "Target file path")
 	cmd.Flags().BoolP("force", "f", false, "Download even when already downloaded")
 	_ = cmd.MarkFlagRequired("file")
@@ -457,7 +457,7 @@ func pkgDefineDownloadFlags(cmd *cobra.Command) {
 
 func pkgDefineUpdateFlags(cmd *cobra.Command) {
 	cmd.Flags().String("pid", "", "ID (group:name:version)'")
-	cmd.Flags().String("path", "", "Remote path on AEM repository")
+	cmd.Flags().String("path", "", "Remote repository path")
 	cmd.Flags().StringSliceP("filter-roots", "r", []string{}, "Vault filter root paths")
 	cmd.MarkFlagsOneRequired("pid", "path")
 	cmd.MarkFlagsMutuallyExclusive("pid", "path")
@@ -474,7 +474,7 @@ func pkgDefineCreateFlags(cmd *cobra.Command) {
 
 func pkgDefineBuildFlags(cmd *cobra.Command) {
 	cmd.Flags().String("pid", "", "ID (group:name:version)'")
-	cmd.Flags().String("path", "", "Remote path on AEM repository")
+	cmd.Flags().String("path", "", "Remote repository path")
 	cmd.MarkFlagsMutuallyExclusive("pid", "path")
 	cmd.Flags().BoolP("force", "f", false, "Build even when already built")
 	cmd.MarkFlagsOneRequired("pid", "path")

diff --git a/pkg/package.go b/pkg/package.go
@@ -206,7 +206,7 @@ func (p Package) UpdateFilters(filters []PackageFilter) error {
 		return err
 	}
 	if !state.Exists {
-		return fmt.Errorf("%s > filters for package '%s' cannot be updated as it does not exist", p.manager.instance.ID(), p.PID.String())
+		return fmt.Errorf("%s > filters of package '%s' cannot be updated as it does not exist", p.manager.instance.ID(), p.PID.String())
 	}
 	return p.manager.UpdateFilters(state.Data.Path, state.PID, filters)
 }

diff --git a/pkg/package_manager.go b/pkg/package_manager.go
@@ -230,7 +230,7 @@ type PackageFilterRule struct {
 }
 
 func (pm *PackageManager) UpdateFilters(remotePath string, pid string, filters []PackageFilter) error {
-	log.Infof("%s > updating package '%s'", pm.instance.ID(), pid)
+	log.Infof("%s > updating filters of package '%s'", pm.instance.ID(), pid)
 	pidConfig, err := pkg.ParsePID(pid)
 	if err != nil {
 		return err
@@ -249,18 +249,18 @@ func (pm *PackageManager) UpdateFilters(remotePath string, pid string, filters [
 		}).
 		Post(UpdatePath)
 	if err != nil {
-		return fmt.Errorf("%s > cannot update filters for package '%s': %w", pm.instance.ID(), pid, err)
+		return fmt.Errorf("%s > cannot update filters of package '%s': %w", pm.instance.ID(), pid, err)
 	} else if response.IsError() {
-		return fmt.Errorf("%s > cannot update filters for package '%s': %s", pm.instance.ID(), pid, response.Status())
+		return fmt.Errorf("%s > cannot update filters of package '%s': %s", pm.instance.ID(), pid, response.Status())
 	}
 	var status pkg.CommandResult
 	if err = fmtx.UnmarshalJSON(response.RawBody(), &status); err != nil {
-		return fmt.Errorf("%s > cannot update filters for package '%s'; cannot parse response: %w", pm.instance.ID(), pid, err)
+		return fmt.Errorf("%s > cannot update filters of package '%s'; cannot parse response: %w", pm.instance.ID(), pid, err)
 	}
 	if !status.Success {
-		return fmt.Errorf("%s > cannot update filters for package '%s'; unexpected status: %s", pm.instance.ID(), pid, status.Message)
+		return fmt.Errorf("%s > cannot update filters of package '%s'; unexpected status: %s", pm.instance.ID(), pid, status.Message)
 	}
-	log.Infof("%s > update filters for package '%s'", pm.instance.ID(), pid)
+	log.Infof("%s > updated filters of package '%s'", pm.instance.ID(), pid)
 	return nil
 }