Optimization Pass

internal/app/app.go

@@ -181,8 +181,8 @@ func runBuildModule(ctx context) error {
 type buildHAKOptions struct {
 	filteredHAKs     []string
 	filteredArchives []string
-	sourceManifest  string
-	planOnly        bool
+	sourceManifest   string
+	planOnly         bool
 }
 
 func runBuildHAKs(ctx context) error {
@@ -436,7 +436,12 @@ func runBuildTopData(ctx context) error {
 		return err
 	}
 
-	result, err := topdata.BuildAndPackage(p, func(message string) {
+	opts, err := parseBuildTopDataArgs("build-topdata", ctx.args[1:])
+	if err != nil {
+		return err
+	}
+
+	result, err := topdata.BuildAndPackageWithOptions(p, opts, func(message string) {
 		fmt.Fprintf(ctx.stdout, "[build-topdata] %s\n", message)
 	})
 	if err != nil {
@@ -467,7 +472,12 @@ func runBuildTopPackage(ctx context) error {
 		return err
 	}
 
-	result, err := topdata.BuildAndPackage(p, func(message string) {
+	opts, err := parseBuildTopDataArgs("build-top-package", ctx.args[1:])
+	if err != nil {
+		return err
+	}
+
+	result, err := topdata.BuildAndPackageWithOptions(p, opts, func(message string) {
 		fmt.Fprintf(ctx.stdout, "[build-top-package] %s\n", message)
 	})
 	if err != nil {
@@ -492,6 +502,21 @@ func runBuildTopPackage(ctx context) error {
 	return nil
 }
 
+func parseBuildTopDataArgs(commandName string, args []string) (topdata.BuildAndPackageOptions, error) {
+	opts := topdata.BuildAndPackageOptions{}
+	for _, arg := range args {
+		switch arg {
+		case "--force":
+			opts.Force = true
+		case "-h", "--help":
+			return opts, fmt.Errorf("usage: %s [--force]", commandName)
+		default:
+			return opts, fmt.Errorf("unknown %s argument %q", commandName, arg)
+		}
+	}
+	return opts, nil
+}
+
 func runCompareTopData(ctx context) error {
 	p, err := loadProject(ctx.cwd)
 	if err != nil {