Add support for use_squash_pr_title_as_default on repo

github/data_source_github_repository.go

@@ -79,6 +79,10 @@ func dataSourceGithubRepository() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+			"use_squash_pr_title_as_default": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 			"default_branch": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -229,6 +233,7 @@ func dataSourceGithubRepositoryRead(d *schema.ResourceData, meta interface{}) er
 	d.Set("allow_squash_merge", repo.GetAllowSquashMerge())
 	d.Set("allow_rebase_merge", repo.GetAllowRebaseMerge())
 	d.Set("allow_auto_merge", repo.GetAllowAutoMerge())
+	d.Set("use_squash_pr_title_as_default", repo.GetUseSquashPRTitleAsDefault())
 	d.Set("has_downloads", repo.GetHasDownloads())
 	d.Set("full_name", repo.GetFullName())
 	d.Set("default_branch", repo.GetDefaultBranch())

github/resource_github_repository.go

@@ -94,6 +94,11 @@ func resourceGithubRepository() *schema.Resource {
 				Optional: true,
 				Default:  false,
 			},
+			"use_squash_pr_title_as_default": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
 			"delete_branch_on_merge": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -282,25 +287,26 @@ func calculateVisibility(d *schema.ResourceData) string {
 
 func resourceGithubRepositoryObject(d *schema.ResourceData) *github.Repository {
 	return &github.Repository{
-		Name:                github.String(d.Get("name").(string)),
-		Description:         github.String(d.Get("description").(string)),
-		Homepage:            github.String(d.Get("homepage_url").(string)),
-		Visibility:          github.String(calculateVisibility(d)),
-		HasDownloads:        github.Bool(d.Get("has_downloads").(bool)),
-		HasIssues:           github.Bool(d.Get("has_issues").(bool)),
-		HasProjects:         github.Bool(d.Get("has_projects").(bool)),
-		HasWiki:             github.Bool(d.Get("has_wiki").(bool)),
-		IsTemplate:          github.Bool(d.Get("is_template").(bool)),
-		AllowMergeCommit:    github.Bool(d.Get("allow_merge_commit").(bool)),
-		AllowSquashMerge:    github.Bool(d.Get("allow_squash_merge").(bool)),
-		AllowRebaseMerge:    github.Bool(d.Get("allow_rebase_merge").(bool)),
-		AllowAutoMerge:      github.Bool(d.Get("allow_auto_merge").(bool)),
-		DeleteBranchOnMerge: github.Bool(d.Get("delete_branch_on_merge").(bool)),
-		AutoInit:            github.Bool(d.Get("auto_init").(bool)),
-		LicenseTemplate:     github.String(d.Get("license_template").(string)),
-		GitignoreTemplate:   github.String(d.Get("gitignore_template").(string)),
-		Archived:            github.Bool(d.Get("archived").(bool)),
-		Topics:              expandStringList(d.Get("topics").(*schema.Set).List()),
+		Name:                      github.String(d.Get("name").(string)),
+		Description:               github.String(d.Get("description").(string)),
+		Homepage:                  github.String(d.Get("homepage_url").(string)),
+		Visibility:                github.String(calculateVisibility(d)),
+		HasDownloads:              github.Bool(d.Get("has_downloads").(bool)),
+		HasIssues:                 github.Bool(d.Get("has_issues").(bool)),
+		HasProjects:               github.Bool(d.Get("has_projects").(bool)),
+		HasWiki:                   github.Bool(d.Get("has_wiki").(bool)),
+		IsTemplate:                github.Bool(d.Get("is_template").(bool)),
+		AllowMergeCommit:          github.Bool(d.Get("allow_merge_commit").(bool)),
+		AllowSquashMerge:          github.Bool(d.Get("allow_squash_merge").(bool)),
+		AllowRebaseMerge:          github.Bool(d.Get("allow_rebase_merge").(bool)),
+		AllowAutoMerge:            github.Bool(d.Get("allow_auto_merge").(bool)),
+		UseSquashPRTitleAsDefault: github.Bool(d.Get("use_squash_pr_title_as_default").(bool)),
+		DeleteBranchOnMerge:       github.Bool(d.Get("delete_branch_on_merge").(bool)),
+		AutoInit:                  github.Bool(d.Get("auto_init").(bool)),
+		LicenseTemplate:           github.String(d.Get("license_template").(string)),
+		GitignoreTemplate:         github.String(d.Get("gitignore_template").(string)),
+		Archived:                  github.Bool(d.Get("archived").(bool)),
+		Topics:                    expandStringList(d.Get("topics").(*schema.Set).List()),
 	}
 }
 
@@ -440,6 +446,7 @@ func resourceGithubRepositoryRead(d *schema.ResourceData, meta interface{}) erro
 	d.Set("allow_squash_merge", repo.GetAllowSquashMerge())
 	d.Set("allow_rebase_merge", repo.GetAllowRebaseMerge())
 	d.Set("allow_auto_merge", repo.GetAllowAutoMerge())
+	d.Set("use_squash_pr_title_as_default", repo.GetUseSquashPRTitleAsDefault())
 	d.Set("delete_branch_on_merge", repo.GetDeleteBranchOnMerge())
 	d.Set("has_downloads", repo.GetHasDownloads())
 	d.Set("full_name", repo.GetFullName())

github/resource_github_repository_test.go

@@ -24,14 +24,15 @@ func TestAccGithubRepositories(t *testing.T) {
 			  name         = "tf-acc-test-create-%[1]s"
 			  description  = "Terraform acceptance tests %[1]s"
 
-			  has_issues         = true
-			  has_wiki           = true
-			  has_downloads      = true
-			  allow_merge_commit = true
-			  allow_squash_merge = false
-			  allow_rebase_merge = false
-			  allow_auto_merge   = true
-			  auto_init          = false
+			  has_issues                     = true
+			  has_wiki                       = true
+			  has_downloads                  = true
+			  allow_merge_commit             = true
+			  allow_squash_merge             = false
+			  allow_rebase_merge             = false
+			  allow_auto_merge               = true
+			  use_squash_pr_title_as_default = true
+			  auto_init                      = false
 
 			}
 		`, randomID)
@@ -45,6 +46,10 @@ func TestAccGithubRepositories(t *testing.T) {
 				"github_repository.test", "allow_auto_merge",
 				"true",
 			),
+			resource.TestCheckResourceAttr(
+				"github_repository.test", "use_squash_pr_title_as_default",
+				"true",
+			),
 		)
 
 		testCase := func(t *testing.T, mode string) {

go.mod

@@ -5,7 +5,7 @@ go 1.16
 require (
 	github.com/client9/misspell v0.3.4
 	github.com/golangci/golangci-lint v1.25.1
-	github.com/google/go-github/v45 v45.1.0
+	github.com/google/go-github/v45 v45.2.0
 	github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02 // indirect
 	github.com/hashicorp/hcl/v2 v2.3.0 // indirect
 	github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 // indirect

go.sum

@@ -157,8 +157,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v45 v45.1.0 h1:SbUjHMRiCe9cHfu6Me4idWxLQEV8ZW9DLPz69zopyWo=
-github.com/google/go-github/v45 v45.1.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28=
+github.com/google/go-github/v45 v45.2.0 h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FCD+K3FI=
+github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=