Merge pull request #64 from github/git-url

chrisgavin · web-flow · commit 6ac01ae16c96 · 2022-04-06T20:31:08.000+01:00
Add a hidden push option for specifying the destination Git URL
diff --git a/cmd/push.go b/cmd/push.go
@@ -16,7 +16,7 @@ var pushCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		version.LogVersion()
 		cacheDirectory := cachedirectory.NewCacheDirectory(rootFlags.cacheDir)
-		return push.Push(cmd.Context(), cacheDirectory, pushFlags.destinationURL, pushFlags.destinationToken, pushFlags.destinationRepository, pushFlags.actionsAdminUser, pushFlags.force, pushFlags.pushSSH)
+		return push.Push(cmd.Context(), cacheDirectory, pushFlags.destinationURL, pushFlags.destinationToken, pushFlags.destinationRepository, pushFlags.actionsAdminUser, pushFlags.force, pushFlags.pushSSH, pushFlags.gitURL)
 	},
 }
 
@@ -27,6 +27,7 @@ type pushFlagFields struct {
 	actionsAdminUser      string
 	force                 bool
 	pushSSH               bool
+	gitURL                string
 }
 
 var pushFlags = pushFlagFields{}
@@ -45,4 +46,6 @@ func (f *pushFlagFields) Init(cmd *cobra.Command) {
 	cmd.Flags().StringVar(&f.actionsAdminUser, "actions-admin-user", "actions-admin", "The name of the Actions admin user.")
 	cmd.Flags().BoolVar(&f.force, "force", false, "Replace the existing repository even if it was not created by the sync tool.")
 	cmd.Flags().BoolVar(&f.pushSSH, "push-ssh", false, "Push Git contents over SSH rather than HTTPS. To use this option you must have SSH access to your GitHub Enterprise instance configured.")
+	cmd.Flags().StringVar(&f.gitURL, "git-url", "", "Use a custom Git URL for pushing the Action repository contents to.")
+	cmd.Flags().MarkHidden("git-url")
 }
diff --git a/cmd/sync.go b/cmd/sync.go
@@ -18,7 +18,7 @@ var syncCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		err = push.Push(cmd.Context(), cacheDirectory, pushFlags.destinationURL, pushFlags.destinationToken, pushFlags.destinationRepository, pushFlags.actionsAdminUser, pushFlags.force, pushFlags.pushSSH)
+		err = push.Push(cmd.Context(), cacheDirectory, pushFlags.destinationURL, pushFlags.destinationToken, pushFlags.destinationRepository, pushFlags.actionsAdminUser, pushFlags.force, pushFlags.pushSSH, pushFlags.gitURL)
 		if err != nil {
 			return err
 		}
diff --git a/internal/push/push.go b/internal/push/push.go
@@ -53,6 +53,7 @@ type pushService struct {
 	aegis                      bool
 	force                      bool
 	pushSSH                    bool
+	gitURL                     string
 }
 
 func (pushService *pushService) createRepository() (*github.Repository, error) {
@@ -163,9 +164,12 @@ func (pushService *pushService) createRepository() (*github.Repository, error) {
 }
 
 func (pushService *pushService) pushGit(repository *github.Repository, initialPush bool) error {
-	remoteURL := repository.GetCloneURL()
-	if pushService.pushSSH {
-		remoteURL = repository.GetSSHURL()
+	remoteURL := pushService.gitURL
+	if remoteURL == "" {
+		remoteURL = repository.GetCloneURL()
+		if pushService.pushSSH {
+			remoteURL = repository.GetSSHURL()
+		}
 	}
 	if initialPush {
 		log.Debugf("Pushing Git releases to %s...", remoteURL)
@@ -375,7 +379,7 @@ func (pushService *pushService) pushReleases() error {
 	return nil
 }
 
-func Push(ctx context.Context, cacheDirectory cachedirectory.CacheDirectory, destinationURL string, destinationToken string, destinationRepository string, actionsAdminUser string, force bool, pushSSH bool) error {
+func Push(ctx context.Context, cacheDirectory cachedirectory.CacheDirectory, destinationURL string, destinationToken string, destinationRepository string, actionsAdminUser string, force bool, pushSSH bool, gitURL string) error {
 	err := cacheDirectory.CheckOrCreateVersionFile(false, version.Version())
 	if err != nil {
 		return err
@@ -433,6 +437,7 @@ func Push(ctx context.Context, cacheDirectory cachedirectory.CacheDirectory, des
 		aegis:                      aegis,
 		force:                      force,
 		pushSSH:                    pushSSH,
+		gitURL:                     gitURL,
 	}
 
 	repository, err := pushService.createRepository()

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ var syncCmd = &cobra.Command{`
`18`	`18`	`if err != nil {`
`19`	`19`	`return err`
`20`	`20`	`}`
`21`		`- err = push.Push(cmd.Context(), cacheDirectory, pushFlags.destinationURL, pushFlags.destinationToken, pushFlags.destinationRepository, pushFlags.actionsAdminUser, pushFlags.force, pushFlags.pushSSH)`
	`21`	`+ err = push.Push(cmd.Context(), cacheDirectory, pushFlags.destinationURL, pushFlags.destinationToken, pushFlags.destinationRepository, pushFlags.actionsAdminUser, pushFlags.force, pushFlags.pushSSH, pushFlags.gitURL)`
`22`	`22`	`if err != nil {`
`23`	`23`	`return err`
`24`	`24`	`}`