Merge pull request openshift#7778 from r4f4/azure-install-errors-deprec

CORS-2775: ic: azure: remove deprecated `errors` package

Author: openshift-merge-bot[bot]

pkg/asset/installconfig/azure/azure.go

@@ -9,7 +9,6 @@ import (
 	survey "github.com/AlecAivazis/survey/v2"
 	"github.com/AlecAivazis/survey/v2/core"
 	"github.com/Azure/go-autorest/autorest/to"
-	"github.com/pkg/errors"
 
 	"github.com/openshift/installer/pkg/types/azure"
 )
@@ -31,12 +30,12 @@ func Platform() (*azure.Platform, error) {
 
 	regions, err := getRegions(context.TODO(), client)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get list of regions")
+		return nil, fmt.Errorf("failed to get list of regions: %w", err)
 	}
 
 	resourceCapableRegions, err := getResourceCapableRegions(context.TODO(), client)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get list of resources to check available regions")
+		return nil, fmt.Errorf("failed to get list of resources to check available regions: %w", err)
 	}
 
 	longRegions := make([]string, 0, len(regions))
@@ -63,7 +62,7 @@ func Platform() (*azure.Platform, error) {
 
 	_, ok := regions[defaultRegion]
 	if !ok {
-		return nil, errors.Errorf("installer bug: invalid default azure region %q", defaultRegion)
+		return nil, fmt.Errorf("installer bug: invalid default azure region %q", defaultRegion)
 	}
 
 	sort.Strings(longRegions)
@@ -82,7 +81,7 @@ func Platform() (*azure.Platform, error) {
 				choice := regionTransform(ans).(core.OptionAnswer).Value
 				i := sort.SearchStrings(shortRegions, choice)
 				if i == len(shortRegions) || shortRegions[i] != choice {
-					return errors.Errorf("invalid region %q", choice)
+					return fmt.Errorf("invalid region %q", choice)
 				}
 				return nil
 			}),

pkg/asset/installconfig/azure/client.go

@@ -2,6 +2,7 @@ package azure
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -13,7 +14,6 @@ import (
 	azenc "github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
 	azmarketplace "github.com/Azure/azure-sdk-for-go/profiles/latest/marketplaceordering/mgmt/marketplaceordering"
 	"github.com/Azure/go-autorest/autorest/to"
-	"github.com/pkg/errors"
 )
 
 //go:generate mockgen -source=./client.go -destination=mock/azureclient_generated.go -package=mock
@@ -65,7 +65,7 @@ func (c *Client) GetVirtualNetwork(ctx context.Context, resourceGroupName, virtu
 
 	vnet, err := vnetClient.Get(ctx, resourceGroupName, virtualNetwork, "")
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get virtual network %s", virtualNetwork)
+		return nil, fmt.Errorf("failed to get virtual network %s: %w", virtualNetwork, err)
 	}
 
 	return &vnet, nil
@@ -83,7 +83,7 @@ func (c *Client) getSubnet(ctx context.Context, resourceGroupName, virtualNetwor
 
 	subnet, err := subnetsClient.Get(ctx, resourceGroupName, virtualNetwork, subNetwork, "")
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get subnet %s", subNetwork)
+		return nil, fmt.Errorf("failed to get subnet %s: %w", subNetwork, err)
 	}
 
 	return &subnet, nil
@@ -131,7 +131,7 @@ func (c *Client) ListLocations(ctx context.Context) (*[]azsubs.Location, error)
 
 	locations, err := subsClient.ListLocations(ctx, c.ssn.Credentials.SubscriptionID)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to list locations")
+		return nil, fmt.Errorf("failed to list locations: %w", err)
 	}
 
 	return locations.Value, nil
@@ -156,7 +156,7 @@ func (c *Client) GetResourcesProvider(ctx context.Context, resourceProviderNames
 
 	provider, err := providersClient.Get(ctx, resourceProviderNamespace, "")
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get resource provider %s", resourceProviderNamespace)
+		return nil, fmt.Errorf("failed to get resource provider %s: %w", resourceProviderNamespace, err)
 	}
 
 	return &provider, nil
@@ -180,7 +180,7 @@ func (c *Client) GetDiskSkus(ctx context.Context, region string) ([]azsku.Resour
 
 	for skuPage, err := client.List(ctx); skuPage.NotDone(); err = skuPage.NextWithContext(ctx) {
 		if err != nil {
-			return nil, errors.Wrap(err, "error fetching SKU pages")
+			return nil, fmt.Errorf("error fetching SKU pages: %w", err)
 		}
 		for _, page := range skuPage.Values() {
 			for _, diskRegion := range to.StringSlice(page.Locations) {
@@ -195,7 +195,7 @@ func (c *Client) GetDiskSkus(ctx context.Context, region string) ([]azsku.Resour
 		return sku, nil
 	}
 
-	return nil, errors.Errorf("no disks for specified subscription in region %s", region)
+	return nil, fmt.Errorf("no disks for specified subscription in region %s", region)
 }
 
 // GetGroup returns resource group for the groupName.
@@ -207,7 +207,7 @@ func (c *Client) GetGroup(ctx context.Context, groupName string) (*azres.Group,
 
 	res, err := client.Get(ctx, groupName)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get resource group")
+		return nil, fmt.Errorf("failed to get resource group: %w", err)
 	}
 	return &res, nil
 }
@@ -222,7 +222,7 @@ func (c *Client) ListResourceIDsByGroup(ctx context.Context, groupName string) (
 	var res []string
 	for resPage, err := client.ListByResourceGroup(ctx, groupName, "", "", nil); resPage.NotDone(); err = resPage.NextWithContext(ctx) {
 		if err != nil {
-			return nil, errors.Wrap(err, "error fetching resource pages")
+			return nil, fmt.Errorf("error fetching resource pages: %w", err)
 		}
 		for _, page := range resPage.Values() {
 			res = append(res, to.String(page.ID))
@@ -240,7 +240,7 @@ func (c *Client) GetVirtualMachineSku(ctx context.Context, name, region string)
 
 	for page, err := client.List(ctx); page.NotDone(); err = page.NextWithContext(ctx) {
 		if err != nil {
-			return nil, errors.Wrap(err, "error fetching SKU pages")
+			return nil, fmt.Errorf("error fetching SKU pages: %w", err)
 		}
 		for _, sku := range page.Values() {
 			// Filter out resources that are not virtualMachines
@@ -271,7 +271,7 @@ func (c *Client) GetDiskEncryptionSet(ctx context.Context, subscriptionID, group
 
 	diskEncryptionSet, err := client.Get(ctx, groupName, diskEncryptionSetName)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get disk encryption set")
+		return nil, fmt.Errorf("failed to get disk encryption set: %w", err)
 	}
 
 	return &diskEncryptionSet, nil
@@ -281,7 +281,7 @@ func (c *Client) GetDiskEncryptionSet(ctx context.Context, subscriptionID, group
 func (c *Client) GetVirtualMachineFamily(ctx context.Context, name, region string) (string, error) {
 	typeMeta, err := c.GetVirtualMachineSku(ctx, name, region)
 	if err != nil {
-		return "", fmt.Errorf("error connecting to Azure client: %v", err)
+		return "", fmt.Errorf("error connecting to Azure client: %w", err)
 	}
 	if typeMeta == nil {
 		return "", fmt.Errorf("not found in region %s", region)
@@ -298,7 +298,7 @@ func (c *Client) GetVirtualMachineFamily(ctx context.Context, name, region strin
 func (c *Client) GetVMCapabilities(ctx context.Context, instanceType, region string) (map[string]string, error) {
 	typeMeta, err := c.GetVirtualMachineSku(ctx, instanceType, region)
 	if err != nil {
-		return nil, fmt.Errorf("error connecting to Azure client: %v", err)
+		return nil, fmt.Errorf("error connecting to Azure client: %w", err)
 	}
 	if typeMeta == nil {
 		return nil, fmt.Errorf("not found in region %s", region)
@@ -330,7 +330,7 @@ func (c *Client) GetMarketplaceImage(ctx context.Context, region, publisher, off
 	defer cancel()
 
 	image, err := client.Get(ctx, region, publisher, offer, sku, version)
-	return image, errors.Wrap(err, "could not get marketplace image")
+	return image, fmt.Errorf("could not get marketplace image: %w", err)
 }
 
 // AreMarketplaceImageTermsAccepted tests whether the terms have been accepted for the specified marketplace VM image.

pkg/asset/installconfig/azure/dns.go

@@ -2,13 +2,13 @@ package azure
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"time"
 
 	survey "github.com/AlecAivazis/survey/v2"
 	azdns "github.com/Azure/azure-sdk-for-go/profiles/2018-03-01/dns/mgmt/dns"
 	"github.com/Azure/go-autorest/autorest/to"
-	"github.com/pkg/errors"
 )
 
 // DNSConfig exposes functions to choose the DNS settings
@@ -85,7 +85,7 @@ func (config DNSConfig) GetDNSZone() (*Zone, error) {
 		},
 	}, &zoneName)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed UserInput")
+		return nil, fmt.Errorf("failed UserInput: %w", err)
 	}
 
 	return &Zone{

pkg/asset/installconfig/azure/metadata.go

@@ -1,10 +1,9 @@
 package azure
 
 import (
+	"fmt"
 	"sync"
 
-	"github.com/pkg/errors"
-
 	typesazure "github.com/openshift/installer/pkg/types/azure"
 )
 
@@ -63,7 +62,7 @@ func (m *Metadata) unlockedSession() (*Session, error) {
 		var err error
 		m.session, err = GetSessionWithCredentials(m.CloudName, m.ARMEndpoint, m.Credentials)
 		if err != nil {
-			return nil, errors.Wrap(err, "creating Azure session")
+			return nil, fmt.Errorf("creating Azure session: %w", err)
 		}
 	}
 

pkg/asset/installconfig/azure/session.go

@@ -2,6 +2,8 @@ package azure
 
 import (
 	"encoding/json"
+	"errors"
+	"fmt"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -16,7 +18,6 @@ import (
 	azureenv "github.com/Azure/go-autorest/autorest/azure"
 	"github.com/jongio/azidext/go/azidext"
 	azurekiota "github.com/microsoft/kiota-authentication-azure-go"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
 	"github.com/openshift/installer/pkg/types/azure"
@@ -79,7 +80,7 @@ func GetSessionWithCredentials(cloudName azure.CloudEnvironment, armEndpoint str
 		cloudEnv, err = azureenv.EnvironmentFromName(string(cloudName))
 	}
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to get Azure environment for the %q cloud", cloudName)
+		return nil, fmt.Errorf("failed to get Azure environment for the %q cloud: %w", cloudName, err)
 	}
 
 	var cloudConfig cloud.Configuration
@@ -152,11 +153,11 @@ func credentialsFromFileOrUser() (*Credentials, error) {
 			logrus.Infof("Asking user to provide authentication info")
 			credentials, cerr := askForCredentials()
 			if cerr != nil {
-				return nil, errors.Wrap(cerr, "failed to retrieve credentials from user")
+				return nil, fmt.Errorf("failed to retrieve credentials from user: %w", cerr)
 			}
 			logrus.Infof("Saving user credentials to %q", authFilePath)
 			if cerr = saveCredentials(*credentials, authFilePath); cerr != nil {
-				return nil, errors.Wrap(cerr, "failed to save credentials")
+				return nil, fmt.Errorf("failed to save credentials: %w", cerr)
 			}
 			authFile = *credentials
 		} else {
@@ -280,7 +281,7 @@ func newTokenCredentialFromCredentials(credentials *Credentials, cloudConfig clo
 
 	cred, err := azidentity.NewClientSecretCredential(credentials.TenantID, credentials.ClientID, credentials.ClientSecret, &options)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get client credentials from secret")
+		return nil, fmt.Errorf("failed to get client credentials from secret: %w", err)
 	}
 	return cred, nil
 }
@@ -294,7 +295,7 @@ func newTokenCredentialFromCertificates(credentials *Credentials, cloudConfig cl
 
 	data, err := os.ReadFile(credentials.ClientCertificatePath)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to read client certificate file")
+		return nil, fmt.Errorf("failed to read client certificate file: %w", err)
 	}
 
 	// NewClientCertificateCredential requires at least one *x509.Certificate,
@@ -304,12 +305,12 @@ func newTokenCredentialFromCertificates(credentials *Credentials, cloudConfig cl
 	// keys.
 	certs, key, err := azidentity.ParseCertificates(data, []byte(credentials.ClientCertificatePassword))
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to parse client certificate")
+		return nil, fmt.Errorf("failed to parse client certificate: %w", err)
 	}
 
 	cred, err := azidentity.NewClientCertificateCredential(credentials.TenantID, credentials.ClientID, certs, key, &options)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get client credentials from certificate")
+		return nil, fmt.Errorf("failed to get client credentials from certificate: %w", err)
 	}
 	return cred, nil
 }
@@ -327,7 +328,7 @@ func newTokenCredentialFromMSI(credentials *Credentials, cloudConfig cloud.Confi
 
 	cred, err := azidentity.NewManagedIdentityCredential(&options)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get client credentials from MSI")
+		return nil, fmt.Errorf("failed to get client credentials from MSI: %w", err)
 	}
 	return cred, nil
 }
@@ -343,7 +344,7 @@ func newSessionFromCredentials(cloudEnv azureenv.Environment, credentials *Crede
 	}
 	authProvider, err := azurekiota.NewAzureIdentityAuthenticationProviderWithScopes(cred, scope)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get Azidentity authentication provider")
+		return nil, fmt.Errorf("failed to get Azidentity authentication provider: %w", err)
 	}
 
 	// Use an adapter so azidentity in the Azure SDK can be used as

pkg/asset/installconfig/azure/validation.go

@@ -13,7 +13,6 @@ import (
 	aznetwork "github.com/Azure/azure-sdk-for-go/profiles/2018-03-01/network/mgmt/network"
 	azenc "github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
 	"github.com/Azure/go-autorest/autorest/to"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/validation/field"
@@ -98,7 +97,7 @@ func validateConfidentialDiskEncryptionSet(client API, diskEncryptionSet *aztype
 	if requestErr != nil {
 		return requestErr
 	} else if resp == nil || resp.EncryptionSetProperties == nil || resp.EncryptionSetProperties.EncryptionType != azenc.ConfidentialVMEncryptedWithCustomerKey {
-		return errors.Errorf("the disk encryption set should be created with type %s", azenc.ConfidentialVMEncryptedWithCustomerKey)
+		return fmt.Errorf("the disk encryption set should be created with type %s", azenc.ConfidentialVMEncryptedWithCustomerKey)
 	}
 	return nil
 }
@@ -549,7 +548,7 @@ func validateMachineNetworksContainIP(fldPath *field.Path, networks []types.Mach
 func validateRegion(client API, fieldPath *field.Path, p *aztypes.Platform) field.ErrorList {
 	locations, err := client.ListLocations(context.TODO())
 	if err != nil {
-		return field.ErrorList{field.InternalError(fieldPath, errors.Wrap(err, "failed to retrieve available regions"))}
+		return field.ErrorList{field.InternalError(fieldPath, fmt.Errorf("failed to retrieve available regions: %w", err))}
 	}
 
 	availableRegions := map[string]string{}
@@ -572,7 +571,7 @@ func validateRegion(client API, fieldPath *field.Path, p *aztypes.Platform) fiel
 
 	provider, err := client.GetResourcesProvider(context.TODO(), "Microsoft.Resources")
 	if err != nil {
-		return field.ErrorList{field.InternalError(fieldPath, errors.Wrap(err, "failed to retrieve resource capable regions"))}
+		return field.ErrorList{field.InternalError(fieldPath, fmt.Errorf("failed to retrieve resource capable regions: %w", err))}
 	}
 
 	for _, resType := range *provider.ResourceTypes {
@@ -605,19 +604,19 @@ func ValidatePublicDNS(ic *types.InstallConfig, azureDNS *DNSConfig) error {
 	// Look for an existing CNAME first
 	rs, err := azureDNS.GetDNSRecordSet(rgName, zoneName, record, azdns.CNAME)
 	if err == nil && rs.CnameRecord != nil {
-		return errors.New(fmt.Sprintf(fmtStr, zoneName, azdns.CNAME, clusterName))
+		return fmt.Errorf(fmtStr, zoneName, azdns.CNAME, clusterName)
 	}
 
 	// Look for an A record
 	rs, err = azureDNS.GetDNSRecordSet(rgName, zoneName, record, azdns.A)
 	if err == nil && rs.ARecords != nil && len(*rs.ARecords) > 0 {
-		return errors.New(fmt.Sprintf(fmtStr, zoneName, azdns.A, clusterName))
+		return fmt.Errorf(fmtStr, zoneName, azdns.A, clusterName)
 	}
 
 	// Look for an AAAA record
 	rs, err = azureDNS.GetDNSRecordSet(rgName, zoneName, record, azdns.AAAA)
 	if err == nil && rs.AaaaRecords != nil && len(*rs.AaaaRecords) > 0 {
-		return errors.New(fmt.Sprintf(fmtStr, zoneName, azdns.AAAA, clusterName))
+		return fmt.Errorf(fmtStr, zoneName, azdns.AAAA, clusterName)
 	}
 
 	return nil
@@ -642,7 +641,7 @@ func validateResourceGroup(client API, fieldPath *field.Path, platform *aztypes.
 	}
 	group, err := client.GetGroup(context.TODO(), platform.ResourceGroupName)
 	if err != nil {
-		return append(allErrs, field.InternalError(fieldPath.Child("resourceGroupName"), errors.Wrap(err, "failed to get resource group")))
+		return append(allErrs, field.InternalError(fieldPath.Child("resourceGroupName"), fmt.Errorf("failed to get resource group: %w", err)))
 	}
 
 	normalizedRegion := strings.Replace(strings.ToLower(to.String(group.Location)), " ", "", -1)
@@ -669,7 +668,7 @@ func validateResourceGroup(client API, fieldPath *field.Path, platform *aztypes.
 	if !platform.IsARO() {
 		ids, err := client.ListResourceIDsByGroup(context.TODO(), platform.ResourceGroupName)
 		if err != nil {
-			return append(allErrs, field.InternalError(fieldPath.Child("resourceGroupName"), errors.Wrap(err, "failed to list resources in the resource group")))
+			return append(allErrs, field.InternalError(fieldPath.Child("resourceGroupName"), fmt.Errorf("failed to list resources in the resource group: %w", err)))
 		}
 		if l := len(ids); l > 0 {
 			if len(ids) > 2 {