fix: support repository autolink references on non-default ports (#1552)

Resolves #1551

Co-authored-by: Keegan Campbell <[email protected]>

Author: isometry

github/resource_github_repository_autolink_reference.go

@@ -51,7 +51,7 @@ func resourceGithubRepositoryAutolinkReference() *schema.Resource {
 				Required:     true,
 				ForceNew:     true,
 				Description:  "The template of the target URL used for the links; must be a valid URL and contain `<num>` for the reference number",
-				ValidateFunc: validation.StringMatch(regexp.MustCompile(`^http[s]?:\/\/[a-z0-9-.]*\/.*?<num>.*?$`), "must be a valid URL and contain <num> token"),
+				ValidateFunc: validation.StringMatch(regexp.MustCompile(`^http[s]?:\/\/[a-z0-9-.]*(:[0-9]+)?\/.*?<num>.*?$`), "must be a valid URL and contain <num> token"),
 			},
 			"is_alphanumeric": {
 				Type:        schema.TypeBool,

github/resource_github_repository_autolink_reference_test.go

@@ -16,32 +16,39 @@ func TestAccGithubRepositoryAutolinkReference(t *testing.T) {
 
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
-				name		= "test-%s"
-				description	= "Test autolink creation"
+				name        = "test-%s"
+				description = "Test autolink creation"
 			}
 
 			resource "github_repository_autolink_reference" "autolink_default" {
 				repository = github_repository.test.name
 
-				key_prefix			= "TEST1-"
+				key_prefix          = "TEST1-"
 				target_url_template = "https://example.com/TEST-<num>"
 			}
 
 			resource "github_repository_autolink_reference" "autolink_alphanumeric" {
 				repository = github_repository.test.name
 
-				key_prefix 		    = "TEST2-"
+				key_prefix          = "TEST2-"
 				target_url_template = "https://example.com/TEST-<num>"
 				is_alphanumeric     = true
 			}
 
 			resource "github_repository_autolink_reference" "autolink_numeric" {
 				repository = github_repository.test.name
 
-				key_prefix 		    = "TEST3-"
+				key_prefix          = "TEST3-"
 				target_url_template = "https://example.com/TEST-<num>"
 				is_alphanumeric     = false
 			}
+
+			resource "github_repository_autolink_reference" "autolink_with_port" {
+				repository = github_repository.test.name
+
+				key_prefix          = "TEST4-"
+				target_url_template = "https://example.com:8443/TEST-<num>"
+			}
 		`, randomID)
 
 		check := resource.ComposeTestCheckFunc(
@@ -75,6 +82,16 @@ func TestAccGithubRepositoryAutolinkReference(t *testing.T) {
 			resource.TestCheckResourceAttr(
 				"github_repository_autolink_reference.autolink_numeric", "is_alphanumeric", "false",
 			),
+			// autolink_with_port
+			resource.TestCheckResourceAttr(
+				"github_repository_autolink_reference.autolink_with_port", "key_prefix", "TEST4-",
+			),
+			resource.TestCheckResourceAttr(
+				"github_repository_autolink_reference.autolink_with_port", "target_url_template", "https://example.com:8443/TEST-<num>",
+			),
+			resource.TestCheckResourceAttr(
+				"github_repository_autolink_reference.autolink_with_port", "is_alphanumeric", "true",
+			),
 		)
 
 		testCase := func(t *testing.T, mode string) {
@@ -108,32 +125,39 @@ func TestAccGithubRepositoryAutolinkReference(t *testing.T) {
 
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
-				name		= "test-%s"
-				description	= "Test autolink creation"
+				name        = "test-%s"
+				description = "Test autolink creation"
 			}
 
 			resource "github_repository_autolink_reference" "autolink_default" {
 				repository = github_repository.test.name
 
-				key_prefix			= "TEST1-"
+				key_prefix          = "TEST1-"
 				target_url_template = "https://example.com/TEST-<num>"
 			}
 
 			resource "github_repository_autolink_reference" "autolink_alphanumeric" {
 				repository = github_repository.test.name
 
-				key_prefix 		    = "TEST2-"
+				key_prefix          = "TEST2-"
 				target_url_template = "https://example.com/TEST-<num>"
 				is_alphanumeric     = true
 			}
 
 			resource "github_repository_autolink_reference" "autolink_numeric" {
 				repository = github_repository.test.name
 
-				key_prefix 		    = "TEST3-"
+				key_prefix          = "TEST3-"
 				target_url_template = "https://example.com/TEST-<num>"
 				is_alphanumeric     = false
 			}
+
+			resource "github_repository_autolink_reference" "autolink_with_port" {
+				repository = github_repository.test.name
+
+				key_prefix          = "TEST4-"
+				target_url_template = "https://example.com:8443/TEST-<num>"
+			}
 		`, randomID)
 
 		check := resource.ComposeTestCheckFunc(
@@ -167,6 +191,16 @@ func TestAccGithubRepositoryAutolinkReference(t *testing.T) {
 			resource.TestCheckResourceAttr(
 				"github_repository_autolink_reference.autolink_numeric", "is_alphanumeric", "false",
 			),
+			// autolink_with_port
+			resource.TestCheckResourceAttr(
+				"github_repository_autolink_reference.autolink_with_port", "key_prefix", "TEST4-",
+			),
+			resource.TestCheckResourceAttr(
+				"github_repository_autolink_reference.autolink_with_port", "target_url_template", "https://example.com:8443/TEST-<num>",
+			),
+			resource.TestCheckResourceAttr(
+				"github_repository_autolink_reference.autolink_with_port", "is_alphanumeric", "true",
+			),
 		)
 
 		testCase := func(t *testing.T, mode string) {
@@ -199,6 +233,13 @@ func TestAccGithubRepositoryAutolinkReference(t *testing.T) {
 						ImportStateVerify:   true,
 						ImportStateIdPrefix: fmt.Sprintf("test-%s/", randomID),
 					},
+					// autolink_with_port
+					{
+						ResourceName:        "github_repository_autolink_reference.autolink_with_port",
+						ImportState:         true,
+						ImportStateVerify:   true,
+						ImportStateIdPrefix: fmt.Sprintf("test-%s/", randomID),
+					},
 				},
 			})
 		}
@@ -221,14 +262,14 @@ func TestAccGithubRepositoryAutolinkReference(t *testing.T) {
 
 		config := fmt.Sprintf(`
 			resource "github_repository" "test" {
-				name		= "test-%s"
-				description	= "Test autolink creation"
+				name        = "test-%s"
+				description = "Test autolink creation"
 			}
 
 			resource "github_repository_autolink_reference" "autolink_default" {
 				repository = github_repository.test.name
 
-				key_prefix			= "TEST1-"
+				key_prefix          = "TEST1-"
 				target_url_template = "https://example.com/TEST-<num>"
 			}
 		`, randomID)