check for err as well

phm07 · phm07 · commit 8f35cd314af0 · 2024-12-20T10:17:34.000+01:00
diff --git a/hcloud/certificate.go b/hcloud/certificate.go
@@ -131,7 +131,7 @@ func (c *CertificateClient) GetByName(ctx context.Context, name string) (*Certif
 func (c *CertificateClient) Get(ctx context.Context, idOrName string) (*Certificate, *Response, error) {
 	if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {
 		cert, res, err := c.GetByID(ctx, id)
-		if cert != nil {
+		if cert != nil || err != nil {
 			return cert, res, err
 		}
 	}
diff --git a/hcloud/firewall.go b/hcloud/firewall.go
@@ -129,7 +129,7 @@ func (c *FirewallClient) GetByName(ctx context.Context, name string) (*Firewall,
 func (c *FirewallClient) Get(ctx context.Context, idOrName string) (*Firewall, *Response, error) {
 	if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {
 		fw, res, err := c.GetByID(ctx, id)
-		if fw != nil {
+		if fw != nil || err != nil {
 			return fw, res, err
 		}
 	}
diff --git a/hcloud/floating_ip.go b/hcloud/floating_ip.go
@@ -130,7 +130,7 @@ func (c *FloatingIPClient) GetByName(ctx context.Context, name string) (*Floatin
 func (c *FloatingIPClient) Get(ctx context.Context, idOrName string) (*FloatingIP, *Response, error) {
 	if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {
 		ip, res, err := c.GetByID(ctx, id)
-		if ip != nil {
+		if ip != nil || err != nil {
 			return ip, res, err
 		}
 	}
diff --git a/hcloud/image.go b/hcloud/image.go
@@ -150,7 +150,7 @@ func (c *ImageClient) Get(ctx context.Context, idOrName string) (*Image, *Respon
 func (c *ImageClient) GetForArchitecture(ctx context.Context, idOrName string, architecture Architecture) (*Image, *Response, error) {
 	if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {
 		img, res, err := c.GetByID(ctx, id)
-		if img != nil {
+		if img != nil || err != nil {
 			return img, res, err
 		}
 	}
diff --git a/hcloud/load_balancer.go b/hcloud/load_balancer.go
@@ -276,7 +276,7 @@ func (c *LoadBalancerClient) GetByName(ctx context.Context, name string) (*LoadB
 func (c *LoadBalancerClient) Get(ctx context.Context, idOrName string) (*LoadBalancer, *Response, error) {
 	if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {
 		lb, res, err := c.GetByID(ctx, id)
-		if lb != nil {
+		if lb != nil || err != nil {
 			return lb, res, err
 		}
 	}
diff --git a/hcloud/network.go b/hcloud/network.go
@@ -120,7 +120,7 @@ func (c *NetworkClient) GetByName(ctx context.Context, name string) (*Network, *
 func (c *NetworkClient) Get(ctx context.Context, idOrName string) (*Network, *Response, error) {
 	if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {
 		n, res, err := c.GetByID(ctx, id)
-		if n != nil {
+		if n != nil || err != nil {
 			return n, res, err
 		}
 	}
diff --git a/hcloud/placement_group.go b/hcloud/placement_group.go
@@ -71,7 +71,7 @@ func (c *PlacementGroupClient) GetByName(ctx context.Context, name string) (*Pla
 func (c *PlacementGroupClient) Get(ctx context.Context, idOrName string) (*PlacementGroup, *Response, error) {
 	if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {
 		pg, res, err := c.GetByID(ctx, id)
-		if pg != nil {
+		if pg != nil || err != nil {
 			return pg, res, err
 		}
 	}
diff --git a/hcloud/primary_ip.go b/hcloud/primary_ip.go
@@ -210,7 +210,7 @@ func (c *PrimaryIPClient) GetByName(ctx context.Context, name string) (*PrimaryI
 func (c *PrimaryIPClient) Get(ctx context.Context, idOrName string) (*PrimaryIP, *Response, error) {
 	if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {
 		ip, res, err := c.GetByID(ctx, id)
-		if ip != nil {
+		if ip != nil || err != nil {
 			return ip, res, err
 		}
 	}
diff --git a/hcloud/server.go b/hcloud/server.go
@@ -231,7 +231,7 @@ func (c *ServerClient) GetByName(ctx context.Context, name string) (*Server, *Re
 func (c *ServerClient) Get(ctx context.Context, idOrName string) (*Server, *Response, error) {
 	if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {
 		srv, res, err := c.GetByID(ctx, id)
-		if srv != nil {
+		if srv != nil || err != nil {
 			return srv, res, err
 		}
 	}
diff --git a/hcloud/ssh_key.go b/hcloud/ssh_key.go
@@ -72,7 +72,7 @@ func (c *SSHKeyClient) GetByFingerprint(ctx context.Context, fingerprint string)
 func (c *SSHKeyClient) Get(ctx context.Context, idOrName string) (*SSHKey, *Response, error) {
 	if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {
 		sshKey, res, err := c.GetByID(ctx, id)
-		if sshKey != nil {
+		if sshKey != nil || err != nil {
 			return sshKey, res, err
 		}
 	}
diff --git a/hcloud/volume.go b/hcloud/volume.go
@@ -90,7 +90,7 @@ func (c *VolumeClient) GetByName(ctx context.Context, name string) (*Volume, *Re
 func (c *VolumeClient) Get(ctx context.Context, idOrName string) (*Volume, *Response, error) {
 	if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {
 		vol, res, err := c.GetByID(ctx, id)
-		if vol != nil {
+		if vol != nil || err != nil {
 			return vol, res, err
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func (c CertificateClient) GetByName(ctx context.Context, name string) (Certif`
`131`	`131`	`func (c CertificateClient) Get(ctx context.Context, idOrName string) (Certificate, *Response, error) {`
`132`	`132`	`if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {`
`133`	`133`	`cert, res, err := c.GetByID(ctx, id)`
`134`		`- if cert != nil {`
	`134`	`+ if cert != nil \|\| err != nil {`
`135`	`135`	`return cert, res, err`
`136`	`136`	`}`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ func (c FirewallClient) GetByName(ctx context.Context, name string) (Firewall,`
`129`	`129`	`func (c FirewallClient) Get(ctx context.Context, idOrName string) (Firewall, *Response, error) {`
`130`	`130`	`if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {`
`131`	`131`	`fw, res, err := c.GetByID(ctx, id)`
`132`		`- if fw != nil {`
	`132`	`+ if fw != nil \|\| err != nil {`
`133`	`133`	`return fw, res, err`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func (c FloatingIPClient) GetByName(ctx context.Context, name string) (Floatin`
`130`	`130`	`func (c FloatingIPClient) Get(ctx context.Context, idOrName string) (FloatingIP, *Response, error) {`
`131`	`131`	`if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {`
`132`	`132`	`ip, res, err := c.GetByID(ctx, id)`
`133`		`- if ip != nil {`
	`133`	`+ if ip != nil \|\| err != nil {`
`134`	`134`	`return ip, res, err`
`135`	`135`	`}`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func (c ImageClient) Get(ctx context.Context, idOrName string) (Image, *Respon`
`150`	`150`	`func (c ImageClient) GetForArchitecture(ctx context.Context, idOrName string, architecture Architecture) (Image, *Response, error) {`
`151`	`151`	`if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {`
`152`	`152`	`img, res, err := c.GetByID(ctx, id)`
`153`		`- if img != nil {`
	`153`	`+ if img != nil \|\| err != nil {`
`154`	`154`	`return img, res, err`
`155`	`155`	`}`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ func (c LoadBalancerClient) GetByName(ctx context.Context, name string) (LoadB`
`276`	`276`	`func (c LoadBalancerClient) Get(ctx context.Context, idOrName string) (LoadBalancer, *Response, error) {`
`277`	`277`	`if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {`
`278`	`278`	`lb, res, err := c.GetByID(ctx, id)`
`279`		`- if lb != nil {`
	`279`	`+ if lb != nil \|\| err != nil {`
`280`	`280`	`return lb, res, err`
`281`	`281`	`}`
`282`	`282`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func (c NetworkClient) GetByName(ctx context.Context, name string) (Network, *`
`120`	`120`	`func (c NetworkClient) Get(ctx context.Context, idOrName string) (Network, *Response, error) {`
`121`	`121`	`if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {`
`122`	`122`	`n, res, err := c.GetByID(ctx, id)`
`123`		`- if n != nil {`
	`123`	`+ if n != nil \|\| err != nil {`
`124`	`124`	`return n, res, err`
`125`	`125`	`}`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func (c PlacementGroupClient) GetByName(ctx context.Context, name string) (Pla`
`71`	`71`	`func (c PlacementGroupClient) Get(ctx context.Context, idOrName string) (PlacementGroup, *Response, error) {`
`72`	`72`	`if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {`
`73`	`73`	`pg, res, err := c.GetByID(ctx, id)`
`74`		`- if pg != nil {`
	`74`	`+ if pg != nil \|\| err != nil {`
`75`	`75`	`return pg, res, err`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ func (c PrimaryIPClient) GetByName(ctx context.Context, name string) (PrimaryI`
`210`	`210`	`func (c PrimaryIPClient) Get(ctx context.Context, idOrName string) (PrimaryIP, *Response, error) {`
`211`	`211`	`if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {`
`212`	`212`	`ip, res, err := c.GetByID(ctx, id)`
`213`		`- if ip != nil {`
	`213`	`+ if ip != nil \|\| err != nil {`
`214`	`214`	`return ip, res, err`
`215`	`215`	`}`
`216`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ func (c ServerClient) GetByName(ctx context.Context, name string) (Server, *Re`
`231`	`231`	`func (c ServerClient) Get(ctx context.Context, idOrName string) (Server, *Response, error) {`
`232`	`232`	`if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {`
`233`	`233`	`srv, res, err := c.GetByID(ctx, id)`
`234`		`- if srv != nil {`
	`234`	`+ if srv != nil \|\| err != nil {`
`235`	`235`	`return srv, res, err`
`236`	`236`	`}`
`237`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func (c *SSHKeyClient) GetByFingerprint(ctx context.Context, fingerprint string)`
`72`	`72`	`func (c SSHKeyClient) Get(ctx context.Context, idOrName string) (SSHKey, *Response, error) {`
`73`	`73`	`if id, err := strconv.ParseInt(idOrName, 10, 64); err == nil {`
`74`	`74`	`sshKey, res, err := c.GetByID(ctx, id)`
`75`		`- if sshKey != nil {`
	`75`	`+ if sshKey != nil \|\| err != nil {`
`76`	`76`	`return sshKey, res, err`
`77`	`77`	`}`
`78`	`78`	`}`