Remove repo_name in favor of repo_id field (#321)

* Remove repo_name property in favor of repo ID

* fixes

* Tested builds w/ all repo types

* Removing documentation references to repo name

Author: Nicholas M. Iodice

.azdo/main.tf

@@ -37,7 +37,6 @@ resource "azuredevops_build_definition" "nightly_build" {
   repository {
     repo_type             = "GitHub"
     repo_id               = "microsoft/terraform-provider-azuredevops"
-    repo_name             = "microsoft/terraform-provider-azuredevops"
     branch_name           = "master"
     yml_path              = ".azdo/azure-pipeline-nightly.yml"
     service_connection_id = azuredevops_serviceendpoint_github.github_serviceendpoint.id

README.md

@@ -44,7 +44,6 @@ resource "azuredevops_build_definition" "build_definition" {
   repository {
     repo_type   = "TfsGit"
     repo_id     = azuredevops_git_repository.repository.id
-    repo_name   = azuredevops_git_repository.repository.name
     branch_name = azuredevops_git_repository.repository.default_branch
     yml_path    = "azure-pipelines.yml"
   }

azuredevops/resource_build_definition.go

@@ -136,10 +136,6 @@ func resourceBuildDefinition() *schema.Resource {
 							Type:     schema.TypeString,
 							Required: true,
 						},
-						"repo_name": {
-							Type:     schema.TypeString,
-							Required: true,
-						},
 						"repo_type": {
 							Type:     schema.TypeString,
 							Required: true,
@@ -429,7 +425,6 @@ func flattenRepository(buildDefinition *build.BuildDefinition) interface{} {
 	return []map[string]interface{}{{
 		"yml_path":              yamlFilePath,
 		"repo_id":               *buildDefinition.Repository.Id,
-		"repo_name":             *buildDefinition.Repository.Name,
 		"repo_type":             *buildDefinition.Repository.Type,
 		"branch_name":           *buildDefinition.Repository.DefaultBranch,
 		"service_connection_id": (*buildDefinition.Repository.Properties)["connectedServiceId"],
@@ -735,14 +730,16 @@ func expandBuildDefinition(d *schema.ResourceData) (*build.BuildDefinition, stri
 	repository := repositories[0].(map[string]interface{})
 
 	repoID := repository["repo_id"].(string)
-	repoName := repository["repo_name"].(string)
+	repoName := ""
 	repoType := RepoType(repository["repo_type"].(string))
 	repoURL := ""
 	if strings.EqualFold(string(repoType), string(RepoTypeValues.GitHub)) {
-		repoURL = fmt.Sprintf("https://github.com/%s.git", repoName)
+		repoURL = fmt.Sprintf("https://github.com/%s.git", repoID)
+		repoName = repoID
 	}
 	if strings.EqualFold(string(repoType), string(RepoTypeValues.Bitbucket)) {
-		repoURL = fmt.Sprintf("https://bitbucket.org/%s.git", repoName)
+		repoURL = fmt.Sprintf("https://bitbucket.org/%s.git", repoID)
+		repoName = repoID
 	}
 
 	ciTriggers := expandBuildDefinitionTriggerList(

azuredevops/resource_build_definition_test.go

@@ -442,7 +442,6 @@ func TestAccAzureDevOpsBuildDefinition_Create_Update_Import(t *testing.T) {
 					resource.TestCheckResourceAttrSet(tfBuildDefNode, "project_id"),
 					resource.TestCheckResourceAttrSet(tfBuildDefNode, "revision"),
 					resource.TestCheckResourceAttrSet(tfBuildDefNode, "repository.0.repo_id"),
-					resource.TestCheckResourceAttr(tfBuildDefNode, "repository.0.repo_name", gitRepoName),
 					resource.TestCheckResourceAttr(tfBuildDefNode, "name", buildDefinitionNameThird),
 					resource.TestCheckResourceAttr(tfBuildDefNode, "path", buildDefinitionPathEmpty),
 				),

azuredevops/utils/testhelper/hcl.go

@@ -293,7 +293,6 @@ func TestAccBuildDefinitionResourceGitHub(projectName string, buildDefinitionNam
 		buildPath,
 		"GitHub",
 		"repoOrg/repoName",
-		"repoOrg/repoName",
 		"master",
 		"path/to/yaml",
 		"")
@@ -307,7 +306,6 @@ func TestAccBuildDefinitionResourceBitbucket(projectName string, buildDefinition
 		buildPath,
 		"Bitbucket",
 		"repoOrg/repoName",
-		"repoOrg/repoName",
 		"master",
 		"path/to/yaml",
 		serviceConnectionID)
@@ -321,7 +319,6 @@ func TestAccBuildDefinitionResourceTfsGit(projectName string, gitRepoName string
 		buildPath,
 		"TfsGit",
 		"${azuredevops_git_repository.gitrepo.id}",
-		"${azuredevops_git_repository.gitrepo.name}",
 		"master",
 		"path/to/yaml",
 		"")
@@ -338,7 +335,6 @@ func TestAccBuildDefinitionResource(
 	buildPath string,
 	repoType string,
 	repoID string,
-	repoName string,
 	branchName string,
 	yamlPath string,
 	serviceConnectionID string,
@@ -347,11 +343,10 @@ func TestAccBuildDefinitionResource(
 repository {
 	repo_type             = "%s"
 	repo_id               = "%s"
-	repo_name             = "%s"
 	branch_name           = "%s"
 	yml_path              = "%s"
 	service_connection_id = "%s"
-}`, repoType, repoID, repoName, branchName, yamlPath, serviceConnectionID)
+}`, repoType, repoID, branchName, yamlPath, serviceConnectionID)
 
 	buildDefinitionResource := fmt.Sprintf(`
 resource "azuredevops_build_definition" "build" {

examples/azdo-based-cicd/main.tf

@@ -43,7 +43,6 @@ resource "azuredevops_build_definition" "build" {
   repository {
     repo_type   = "TfsGit"
     repo_id     = azuredevops_git_repository.repository.id
-    repo_name   = azuredevops_git_repository.repository.name
     branch_name = azuredevops_git_repository.repository.default_branch
     yml_path    = "azure-pipelines.yml"
   }

examples/github-based-cicd-simple/main.tf

@@ -31,7 +31,6 @@ resource "azuredevops_build_definition" "nightly_build" {
   repository {
     repo_type             = "GitHub"
     repo_id               = "microsoft/terraform-provider-azuredevops"
-    repo_name             = "microsoft/terraform-provider-azuredevops"
     branch_name           = "master"
     yml_path              = ".azdo/azure-pipeline-nightly.yml"
     service_connection_id = azuredevops_serviceendpoint_github.github_serviceendpoint.id

website/docs/r/build_definition.html.markdown

@@ -58,7 +58,6 @@ resource "azuredevops_build_definition" "build" {
   repository {
     repo_type   = "TfsGit"
     repo_id     = azuredevops_git_repository.repository.id
-    repo_name   = azuredevops_git_repository.repository.name
     branch_name = azuredevops_git_repository.repository.default_branch
     yml_path    = "azure-pipelines.yml"
   }
@@ -85,7 +84,6 @@ The following arguments are supported:
 
 * `branch_name` - (Optional) The branch name for which builds are triggered. Defaults to `master`.
 * `repo_id` - (Required) The id of the repository.
-* `repo_name` - (Required) The name of the repository.
 * `repo_type` - (Optional) The repository type. Valid values: `GitHub` or `TfsGit` or `Bitbucket`. Defaults to `Github`.
 * `service_connection_id` - (Optional) The service connection ID. Used if the `repo_type` is `GitHub`.
 * `yml_path` - (Required) The path of the Yaml file describing the build definition.