Skip to content

OCPBUGS-73750: [release-4.18] Fix pointers without ptr.Deref #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ricky-rav wants to merge 1 commit into
base: release-4.18
Choose a base branch
from
Open

OCPBUGS-73750: [release-4.18] Fix pointers without ptr.Deref #198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions pkg/cloudprovider/azure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,9 @@ OuterLoop:
// BackendAddressPoolPropertiesFormat:(*network.BackendAddressPoolPropertiesFormat)(nil)
// Do a separate get for this pool in order to check whether there are any outbound rules
// attached to it
realPool, err := a.getBackendAddressPool(*pool.ID)
realPool, err := a.getBackendAddressPool(ptr.Deref(pool.ID, ""))
if err != nil {
return fmt.Errorf("error looking up backend address pool %s with ID %s: %v", *pool.Name, *pool.ID, err)
return fmt.Errorf("error looking up backend address pool %s with ID %s: %v", ptr.Deref(pool.Name, ""), ptr.Deref(pool.ID, ""), err)
}
if realPool.BackendAddressPoolPropertiesFormat != nil {
if realPool.BackendAddressPoolPropertiesFormat.OutboundRule != nil {
Expand All @@ -229,7 +229,7 @@ OuterLoop:
outboundRuleStr := ""
if attachedOutboundRule != nil && attachedOutboundRule.ID != nil {
// https://issues.redhat.com/browse/OCPBUGS-33617 showed that there can be a rule without an ID...
outboundRuleStr = fmt.Sprintf(": %s", *attachedOutboundRule.ID)
outboundRuleStr = fmt.Sprintf(": %s", ptr.Deref(attachedOutboundRule.ID, ""))
}
klog.Warningf("Egress IP %s will have no outbound connectivity except for the infrastructure subnet: "+
"omitting backend address pool when adding secondary IP: it has an outbound rule already%s",
Expand Down Expand Up @@ -321,7 +321,7 @@ func (a *Azure) GetNodeEgressIPConfiguration(node *corev1.Node, cpicIPs sets.Set
networkInterface := networkInterfaces[0]
// Prepare the config
config := &NodeEgressIPConfiguration{
Interface: strings.TrimPrefix(getNameFromResourceID(*networkInterface.ID), "/"),
Interface: strings.TrimPrefix(getNameFromResourceID(ptr.Deref(networkInterface.ID, "")), "/"),
}
v4Subnet, v6Subnet, err := a.getSubnet(networkInterface)
if err != nil {
Expand All @@ -344,7 +344,7 @@ func (a *Azure) GetNodeEgressIPConfiguration(node *corev1.Node, cpicIPs sets.Set
func (a *Azure) createOrUpdate(networkInterface network.Interface) (network.InterfacesCreateOrUpdateFuture, error) {
ctx, cancel := context.WithTimeout(a.ctx, defaultAzureOperationTimeout)
defer cancel()
return a.networkClient.CreateOrUpdate(ctx, a.resourceGroup, *networkInterface.Name, networkInterface)
return a.networkClient.CreateOrUpdate(ctx, a.resourceGroup, ptr.Deref(networkInterface.Name, ""), networkInterface)
}

func (a *Azure) waitForCompletion(result network.InterfacesCreateOrUpdateFuture) error {
Expand Down Expand Up @@ -428,8 +428,8 @@ func (a *Azure) getNetworkInterfaces(instance *compute.VirtualMachine) ([]networ
// in the slice. Do it like this because it's assumed to not be guaranteed
// to be first in the slice returned by the Azure API?
for _, netif := range *instance.NetworkProfile.NetworkInterfaces {
if netif.NetworkInterfaceReferenceProperties != nil && netif.Primary != nil && *netif.Primary {
intf, err := a.getNetworkInterface(*netif.ID)
if netif.NetworkInterfaceReferenceProperties != nil && ptr.Deref(netif.Primary, false) {
intf, err := a.getNetworkInterface(ptr.Deref(netif.ID, ""))
if err != nil {
return nil, err
}
Expand All @@ -439,8 +439,8 @@ func (a *Azure) getNetworkInterfaces(instance *compute.VirtualMachine) ([]networ
}
// Get the rest and append that.
for _, netif := range *instance.NetworkProfile.NetworkInterfaces {
if netif.NetworkInterfaceReferenceProperties != nil && ((netif.Primary != nil && !*netif.Primary) || netif.Primary == nil) {
intf, err := a.getNetworkInterface(*netif.ID)
if netif.NetworkInterfaceReferenceProperties != nil && !ptr.Deref(netif.Primary, false) {
intf, err := a.getNetworkInterface(ptr.Deref(netif.ID, ""))
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -547,7 +547,7 @@ func (a *Azure) getAddressPrefixes(networkInterface network.Interface) ([]string
if virtualNetwork.Subnets != nil {
for _, vns := range *virtualNetwork.Subnets {
if vns.Name != nil && vns.AddressPrefix != nil &&
*vns.Name == subnetName {
ptr.Deref(vns.Name, "") == subnetName {
return []string{*vns.AddressPrefix}, nil
}
}
Expand Down