feat: standardize commands

Author: LuisUrr

.gon.hcl

@@ -4,6 +4,7 @@ bundle_id = "com.mitchellh.gon"
 apple_id {
   username = "[email protected]"
   password = "@env:AC_PASSWORD"
+  provider = "UL304B4VGY"
 }
 
 sign {

notarize/info.go

@@ -68,15 +68,10 @@ func info(ctx context.Context, uuid string, opts *Options) (*Info, error) {
 		uuid,
 		"--apple-id", opts.DeveloperId,
 		"--password", opts.Password,
+		"--team-id", opts.Provider,
 		"--output-format", "plist",
 	}
 
-	if opts.Provider != "" {
-		cmd.Args = append(cmd.Args,
-			"--team-id", opts.Provider,
-		)
-	}
-
 	// We store all output in out for logging and in case there is an error
 	var out, combined bytes.Buffer
 	cmd.Stdout = io.MultiWriter(&out, &combined)

notarize/log.go

@@ -71,12 +71,7 @@ func log(ctx context.Context, uuid string, opts *Options) (*Log, error) {
 		uuid,
 		"--apple-id", opts.DeveloperId,
 		"--password", opts.Password,
-	}
-
-	if opts.Provider != "" {
-		cmd.Args = append(cmd.Args,
-			"--team-id", opts.Provider,
-		)
+		"--team-id", opts.Provider,
 	}
 
 	// We store all output in out for logging and in case there is an error

notarize/upload.go

@@ -43,17 +43,8 @@ func upload(ctx context.Context, opts *Options) (string, error) {
 		"--apple-id", opts.DeveloperId,
 		"--password", opts.Password,
 		"--team-id", opts.Provider,
-	}
-
-	if opts.Provider != "" {
-		cmd.Args = append(cmd.Args,
-			"--team-id", opts.Provider,
-		)
-	}
-
-	cmd.Args = append(cmd.Args,
 		"--output-format", "plist",
-	)
+	}
 
 	// We store all output in out for logging and in case there is an error
 	var out, combined bytes.Buffer