Incorporate comments and fixes

6 files changed, 12 insertions, 10 deletions

diff --git a/azuredevops/internal/acceptancetests/data_serviceendpoint_azurerm_test.go b/azuredevops/internal/acceptancetests/data_serviceendpoint_azurerm_test.go
index 2ede34db..3fdb4f96 100644
--- a/azuredevops/internal/acceptancetests/data_serviceendpoint_azurerm_test.go
+++ b/azuredevops/internal/acceptancetests/data_serviceendpoint_azurerm_test.go
@@ -32,7 +32,7 @@ func TestAccServiceEndpointAzureRM_with_serviceEndpointID_DataSource(t *testing.
 				Config: createServiceEndpointAzureRMWithServiceEndpointIDData,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(tfNode, "service_endpoint_name", serviceEndpointAzureRMName),
-					resource.TestCheckResourceAttrSet(tfNode, "id"),
+					resource.TestCheckResourceAttrSet(tfNode, "service_endpoint_id"),
 				),
 			},
 		},
@@ -58,7 +58,7 @@ func TestAccServiceEndpointAzureRM_with_serviceEndpointName_DataSource(t *testin
 				Config: createServiceEndpointAzureRMWithServiceEndpointNameData,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(tfNode, "service_endpoint_name", serviceEndpointAzureRMName),
-					resource.TestCheckResourceAttrSet(tfNode, "id"),
+					resource.TestCheckResourceAttrSet(tfNode, "service_endpoint_id"),
 				),
 			},
 		},
diff --git a/azuredevops/internal/acceptancetests/data_serviceendpoint_github_test.go b/azuredevops/internal/acceptancetests/data_serviceendpoint_github_test.go
index 2c16e550..aa468508 100644
--- a/azuredevops/internal/acceptancetests/data_serviceendpoint_github_test.go
+++ b/azuredevops/internal/acceptancetests/data_serviceendpoint_github_test.go
@@ -29,7 +29,7 @@ func TestAccServiceEndpointGitHub_with_serviceEndpointID_DataSource(t *testing.T
 				Config: createServiceEndpointGitHubWithServiceEndpointIDData,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(tfNode, "service_endpoint_name", serviceEndpointGitHubName),
-					resource.TestCheckResourceAttrSet(tfNode, "id"),
+					resource.TestCheckResourceAttrSet(tfNode, "service_endpoint_id"),
 				),
 			},
 		},
@@ -53,7 +53,7 @@ func TestAccServiceEndpointGitHub_with_serviceEndpointName_DataSource(t *testing
 				Config: createServiceEndpointGitHubWithServiceEndpointNameData,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(tfNode, "service_endpoint_name", serviceEndpointGitHubName),
-					resource.TestCheckResourceAttrSet(tfNode, "id"),
+					resource.TestCheckResourceAttrSet(tfNode, "service_endpoint_id"),
 				),
 			},
 		},
diff --git a/azuredevops/internal/acceptancetests/testutils/hcl.go b/azuredevops/internal/acceptancetests/testutils/hcl.go
index 036ef5b9..377ec3d3 100644
--- a/azuredevops/internal/acceptancetests/testutils/hcl.go
+++ b/azuredevops/internal/acceptancetests/testutils/hcl.go
@@ -256,7 +256,7 @@ func HclServiceEndpointGitHubDataSourceWithServiceEndpointID() string {
 	serviceEndpointDataSource := fmt.Sprintf(`
 data "azuredevops_serviceendpoint_github" "serviceendpoint" {
   project_id = azuredevops_project.project.id
-  id         = azuredevops_serviceendpoint_github.serviceendpoint.id
+  service_endpoint_id         = azuredevops_serviceendpoint_github.serviceendpoint.id
 }
 `)
 	return fmt.Sprintf("%s", serviceEndpointDataSource)
@@ -428,7 +428,7 @@ func HclServiceEndpointAzureRMDataSourceWithServiceEndpointID() string {
 	serviceEndpointDataSource := fmt.Sprintf(`
 data "azuredevops_serviceendpoint_azurerm" "serviceendpointrm" {
   project_id = azuredevops_project.project.id
-  id         = azuredevops_serviceendpoint_azurerm.serviceendpointrm.id
+  service_endpoint_id         = azuredevops_serviceendpoint_azurerm.serviceendpointrm.id
 }
 `)
 	return fmt.Sprintf("%s", serviceEndpointDataSource)
diff --git a/azuredevops/internal/service/serviceendpoint/commons.go b/azuredevops/internal/service/serviceendpoint/commons.go
index a0c5085d..5069f804 100644
--- a/azuredevops/internal/service/serviceendpoint/commons.go
+++ b/azuredevops/internal/service/serviceendpoint/commons.go
@@ -395,16 +395,16 @@ func dataSourceGenBaseServiceEndpointResource(dataSourceReadFunc schema.ReadFunc
 				Type:         schema.TypeString,
 				Optional:     true,
 				Computed:     true,
-				ExactlyOneOf: []string{"service_endpoint_name", "id"},
+				ExactlyOneOf: []string{"service_endpoint_name", "service_endpoint_id"},
 				ValidateFunc: validation.StringIsNotEmpty,
 			},
 
-			"id": {
+			"service_endpoint_id": {
 				Description:  "The ID of the serviceendpoint",
 				Type:         schema.TypeString,
 				Optional:     true,
 				Computed:     true,
-				ExactlyOneOf: []string{"service_endpoint_name", "id"},
+				ExactlyOneOf: []string{"service_endpoint_name", "service_endpoint_id"},
 				ValidateFunc: validation.IsUUID,
 			},
 
@@ -443,7 +443,7 @@ func dataSourceGetBaseServiceEndpoint(d *schema.ResourceData, m interface{}) (*s
 
 	projectID = &parsedProjectID
 
-	if serviceEndpointIDString, ok := d.GetOk("id"); ok {
+	if serviceEndpointIDString, ok := d.GetOk("service_endpoint_id"); ok {
 		var serviceEndpointID *uuid.UUID
 		parsedServiceEndpointID, err := uuid.Parse(serviceEndpointIDString.(string))
 		if err != nil {
diff --git a/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_azurerm.go b/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_azurerm.go
index 5507acba..a50b1f54 100644
--- a/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_azurerm.go
+++ b/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_azurerm.go
@@ -22,6 +22,7 @@ func dataSourceServiceEndpointAzureRMRead(d *schema.ResourceData, m interface{})
 	}
 	if serviceEndpoint != nil {
 		(*serviceEndpoint.Data)["creationMode"] = ""
+		d.Set("service_endpoint_id", serviceEndpoint.Id.String())
 		flattenServiceEndpointAzureRM(d, serviceEndpoint, projectID)
 		return nil
 	}
diff --git a/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_github.go b/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_github.go
index c9677393..7cccc100 100644
--- a/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_github.go
+++ b/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_github.go
@@ -17,6 +17,7 @@ func dataSourceServiceEndpointGithubRead(d *schema.ResourceData, m interface{})
 		return err
 	}
 	if serviceEndpoint != nil {
+		d.Set("service_endpoint_id", serviceEndpoint.Id.String())
 		doBaseFlattening(d, serviceEndpoint, projectID)
 		return nil
 	}