diff options
| author | Sharath Nair <snair3@agl.com.au> | 2022-07-18 23:08:56 +1000 |
|---|---|---|
| committer | Sharath Nair <snair3@agl.com.au> | 2022-07-18 23:08:56 +1000 |
| commit | 8eb4c29e8562e5cc8665aabcbb1debc6ea397435 (patch) | |
| tree | db0329a6b7222c8be465c4422de393721c250a08 | |
| parent | 2cc63344d164fe261ed71bee7609c1b5bdb3b4bf (diff) | |
Fixes to datasource
| -rw-r--r-- | azuredevops/internal/service/serviceendpoint/data_serviceendpoint_azurerm.go | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_azurerm.go b/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_azurerm.go index d7071372..fdbd63e9 100644 --- a/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_azurerm.go +++ b/azuredevops/internal/service/serviceendpoint/data_serviceendpoint_azurerm.go @@ -39,10 +39,8 @@ func DataServiceEndpointAzureRM() *schema.Resource { }, "authorization": { - Type: schema.TypeMap, - Optional: true, - Computed: true, - ValidateFunc: validation.StringIsNotWhiteSpace, + Type: schema.TypeMap, + Computed: true, Elem: &schema.Schema{ Type: schema.TypeString, }, @@ -121,13 +119,8 @@ func dataSourceServiceEndpointAzureRMRead(d *schema.ResourceData, m interface{}) return fmt.Errorf("Error looking up service endpoint with ID (%v) and projectID (%v): %v", serviceEndpointID, projectID, err) } - if serviceEndpoint.Id == nil { - d.SetId("") - } else { - // prevent credential leak into data source - (*serviceEndpoint.Data)["creationMode"] = "" - flattenServiceEndpointAzureRM(d, serviceEndpoint, projectID) - } + (*serviceEndpoint.Data)["creationMode"] = "" + flattenServiceEndpointAzureRM(d, serviceEndpoint, projectID) return nil } @@ -142,13 +135,8 @@ func dataSourceServiceEndpointAzureRMRead(d *schema.ResourceData, m interface{}) return fmt.Errorf("Error looking up service endpoint with name (%v) and projectID (%v): %v", serviceEndpointName, projectID, err) } - if serviceEndpoint.Id == nil { - d.SetId("") - } else { - // prevent credential leak into data source - (*serviceEndpoint.Data)["creationMode"] = "" - flattenServiceEndpointAzureRM(d, serviceEndpoint, projectID) - } + (*serviceEndpoint.Data)["creationMode"] = "" + flattenServiceEndpointAzureRM(d, serviceEndpoint, projectID) return nil } return nil |