commonids: updating Virtual Network and Subnet to use the new errors

hashicorp · May 9, 2023 · d644eaa · d644eaa
1 parent fbe78f7
commit d644eaa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/resourcemanager/commonids/subnet.go b/resourcemanager/commonids/subnet.go
@@ -42,19 +42,19 @@ func ParseSubnetID(input string) (*SubnetId, error) {
 	id := SubnetId{}
 
 	if id.SubscriptionId, ok = parsed.Parsed["subscriptionId"]; !ok {
-		return nil, fmt.Errorf("the segment 'subscriptionId' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "subscriptionId", *parsed)
 	}
 
 	if id.ResourceGroupName, ok = parsed.Parsed["resourceGroupName"]; !ok {
-		return nil, fmt.Errorf("the segment 'resourceGroupName' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "resourceGroupName", *parsed)
 	}
 
 	if id.VirtualNetworkName, ok = parsed.Parsed["virtualNetworkName"]; !ok {
-		return nil, fmt.Errorf("the segment 'virtualNetworkName' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "virtualNetworkName", *parsed)
 	}
 
 	if id.SubnetName, ok = parsed.Parsed["subnetName"]; !ok {
-		return nil, fmt.Errorf("the segment 'subnetName' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "subnetName", *parsed)
 	}
 
 	return &id, nil
@@ -73,19 +73,19 @@ func ParseSubnetIDInsensitively(input string) (*SubnetId, error) {
 	id := SubnetId{}
 
 	if id.SubscriptionId, ok = parsed.Parsed["subscriptionId"]; !ok {
-		return nil, fmt.Errorf("the segment 'subscriptionId' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "subscriptionId", *parsed)
 	}
 
 	if id.ResourceGroupName, ok = parsed.Parsed["resourceGroupName"]; !ok {
-		return nil, fmt.Errorf("the segment 'resourceGroupName' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "resourceGroupName", *parsed)
 	}
 
 	if id.VirtualNetworkName, ok = parsed.Parsed["virtualNetworkName"]; !ok {
-		return nil, fmt.Errorf("the segment 'virtualNetworkName' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "virtualNetworkName", *parsed)
 	}
 
 	if id.SubnetName, ok = parsed.Parsed["subnetName"]; !ok {
-		return nil, fmt.Errorf("the segment 'subnetName' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "subnetName", *parsed)
 	}
 
 	return &id, nil

diff --git a/resourcemanager/commonids/virtual_network.go b/resourcemanager/commonids/virtual_network.go
@@ -40,15 +40,15 @@ func ParseVirtualNetworkID(input string) (*VirtualNetworkId, error) {
 	id := VirtualNetworkId{}
 
 	if id.SubscriptionId, ok = parsed.Parsed["subscriptionId"]; !ok {
-		return nil, fmt.Errorf("the segment 'subscriptionId' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "subscriptionId", *parsed)
 	}
 
 	if id.ResourceGroupName, ok = parsed.Parsed["resourceGroupName"]; !ok {
-		return nil, fmt.Errorf("the segment 'resourceGroupName' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "resourceGroupName", *parsed)
 	}
 
 	if id.VirtualNetworkName, ok = parsed.Parsed["virtualNetworkName"]; !ok {
-		return nil, fmt.Errorf("the segment 'virtualNetworkName' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "virtualNetworkName", *parsed)
 	}
 
 	return &id, nil
@@ -67,15 +67,15 @@ func ParseVirtualNetworkIDInsensitively(input string) (*VirtualNetworkId, error)
 	id := VirtualNetworkId{}
 
 	if id.SubscriptionId, ok = parsed.Parsed["subscriptionId"]; !ok {
-		return nil, fmt.Errorf("the segment 'subscriptionId' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "subscriptionId", *parsed)
 	}
 
 	if id.ResourceGroupName, ok = parsed.Parsed["resourceGroupName"]; !ok {
-		return nil, fmt.Errorf("the segment 'resourceGroupName' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "resourceGroupName", *parsed)
 	}
 
 	if id.VirtualNetworkName, ok = parsed.Parsed["virtualNetworkName"]; !ok {
-		return nil, fmt.Errorf("the segment 'virtualNetworkName' was not found in the resource id %q", input)
+		return nil, resourceids.NewSegmentNotSpecifiedError(id, "virtualNetworkName", *parsed)
 	}
 
 	return &id, nil