[cli] check main after master

[iwahbe]

Description

If no branch is specified, probe master, then probe main before failing.

Fixes #8428

I would be curious if anyone has a different idea on how to download branches from both master and main without breaking changes.

Checklist

• I have added tests that prove my fix is effective or that my feature works

• I have updated the CHANGELOG-PENDING file with my change

• Yes, there are changes in this PR that warrants bumping the Pulumi Service API version

[justinvp]

Allow the user to specify the branch they want to download as part of pulumi new using the pulumi new https://github.com/pierskarsenbarg/new-pulumi#main syntax

Why do we need this? It's already possible to do this via:

pulumi new https://github.com/pierskarsenbarg/new-pulumi/tree/main

If no branch is specified, probe master, then probe main before failing.

This makes sense to me.

[iwahbe]

Why do we need this? It's already possible to do this via:

pulumi new https://github.com/pierskarsenbarg/new-pulumi/tree/main

I didn't catch that. I removed the new version.

[pgavlin]

Could we add a couple unit tests for the repo URL parser? LGTM otherwise.

[iwahbe]

@pgavlin Did you have a specific thing to test in mind? We already have

pulumi/sdk/go/common/util/gitutil/git_test.go

Lines 27 to 74 in 2c25c3f

	func TestParseGitRepoURL(t *testing.T) {
	test := func(expectedURL string, expectedURLPath string, rawurl string) {
	actualURL, actualURLPath, err := ParseGitRepoURL(rawurl)
	assert.NoError(t, err)
	assert.Equal(t, expectedURL, actualURL)
	assert.Equal(t, expectedURLPath, actualURLPath)
	}
	// GitHub.
	pre := "https://github.com/pulumi/templates"
	exp := pre + ".git"
	test(exp, "", pre+".git")
	test(exp, "", pre)
	test(exp, "", pre+"/")
	test(exp, "templates", pre+"/templates")
	test(exp, "templates", pre+"/templates/")
	test(exp, "templates/javascript", pre+"/templates/javascript")
	test(exp, "templates/javascript", pre+"/templates/javascript/")
	test(exp, "tree/master/templates", pre+"/tree/master/templates")
	test(exp, "tree/master/templates/python", pre+"/tree/master/templates/python")
	test(exp, "tree/929b6e4c5c39196ae2482b318f145e0d765e9608/templates",
	pre+"/tree/929b6e4c5c39196ae2482b318f145e0d765e9608/templates")
	test(exp, "tree/929b6e4c5c39196ae2482b318f145e0d765e9608/templates/python",
	pre+"/tree/929b6e4c5c39196ae2482b318f145e0d765e9608/templates/python")
	// Gists.
	pre = "https://gist.github.com/user/1c8c6e43daf20924287c0d476e17de9a"
	exp = "https://gist.github.com/1c8c6e43daf20924287c0d476e17de9a.git"
	test(exp, "", pre)
	test(exp, "", pre+"/")
	testError := func(rawurl string) {
	_, _, err := ParseGitRepoURL(rawurl)
	assert.Error(t, err)
	}
	// No owner.
	testError("https://github.com")
	testError("https://github.com/")
	// No repo.
	testError("https://github.com/pulumi")
	testError("https://github.com/pulumi/")
	// Not HTTPS.
	testError("http://github.com/pulumi/templates.git")
	testError("http://github.com/pulumi/templates")
	}

[pgavlin]

Did you have a specific thing to test in mind? We already have

Nope, those preexisting tests look good!

[justinvp]

LGTM otherwise

[justinvp]

Update to reflect the changes in the PR.