Replace func available in pointer package

fi-ts · Sep 11, 2024 · f617d9a · f617d9a
1 parent 2c46555
commit f617d9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/cmd/dashboard.go b/cmd/dashboard.go
@@ -21,7 +21,6 @@ import (
 	"github.com/fi-ts/cloud-go/api/client/volume"
 	"github.com/fi-ts/cloud-go/api/models"
 	"github.com/fi-ts/cloudctl/cmd/helper"
-	"github.com/fi-ts/cloudctl/cmd/output"
 	"github.com/gardener/gardener/pkg/apis/core/v1beta1"
 	"github.com/google/go-cmp/cmp"
 	"github.com/metal-stack/metal-lib/pkg/cache"
@@ -1266,9 +1265,9 @@ func newCache(cloud *client.CloudAPI, expiration time.Duration, partition, tenan
 	return &apiCache{
 		clusters: cache.New(expiration, func(ctx context.Context, _ string) ([]*models.V1ClusterResponse, error) {
 			resp, err := cloud.Cluster.FindClusters(cluster.NewFindClustersParams().WithBody(&models.V1ClusterFindRequest{
-				PartitionID: output.StrDeref(partition),
-				Tenant:      output.StrDeref(tenant),
-				Purpose:     output.StrDeref(purpose),
+				PartitionID: pointer.PointerOrDefault(partition, ""),
+				Tenant:      pointer.PointerOrDefault(tenant, ""),
+				Purpose:     pointer.PointerOrDefault(purpose, ""),
 			}).WithReturnMachines(pointer.Pointer(false)).WithContext(ctx), nil)
 			if err != nil {
 				return nil, err
@@ -1277,8 +1276,8 @@ func newCache(cloud *client.CloudAPI, expiration time.Duration, partition, tenan
 		}),
 		volumes: cache.New(expiration, func(ctx context.Context, _ string) ([]*models.V1VolumeResponse, error) {
 			resp, err := cloud.Volume.FindVolumes(volume.NewFindVolumesParams().WithBody(&models.V1VolumeFindRequest{
-				PartitionID: output.StrDeref(partition),
-				TenantID:    output.StrDeref(tenant),
+				PartitionID: pointer.PointerOrDefault(partition, ""),
+				TenantID:    pointer.PointerOrDefault(tenant, ""),
 			}).WithContext(ctx), nil)
 			if err != nil {
 				return nil, err

diff --git a/cmd/output/helper.go b/cmd/output/helper.go
@@ -74,13 +74,6 @@ func sortIPs(v1ips []*models.ModelsV1IPResponse) []*models.ModelsV1IPResponse {
 	return result
 }
 
-func StrDeref(s string) *string {
-	if s == "" {
-		return nil
-	}
-	return &s
-}
-
 func printStringSlice(s []string) {
 	var dashed []string
 	for _, elem := range s {