Skip to content

Commit

Permalink
Merge pull request GoogleCloudPlatform#1236 from justinsb/dont_wrap_e…
Browse files Browse the repository at this point in the history 
…rrors

mockgcp: Don't wrap errors in the storage layer
  • Loading branch information
@google-oss-prow
google-oss-prow[bot] authored Feb 13, 2024
2 parents 2a9ad08 + c3d1dc7 commit 320b1b8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 47 deletions.
20 changes: 4 additions & 16 deletions mockgcp/mockcompute/disksv1.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/proto"
apierrors "k8s.io/apimachinery/pkg/api/errors"

"github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp/common/projects"
pb "github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp/generated/mockgcp/cloud/compute/v1"
Expand All @@ -44,11 +43,7 @@ func (s *DisksV1) Get(ctx context.Context, req *pb.GetDiskRequest) (*pb.Disk, er

obj := &pb.Disk{}
if err := s.storage.Get(ctx, fqn, obj); err != nil {
if apierrors.IsNotFound(err) {
return nil, status.Errorf(codes.NotFound, "disk %q not found", name)
} else {
return nil, status.Errorf(codes.Internal, "error reading disk: %v", err)
}
return nil, err
}

return obj, nil
Expand Down Expand Up @@ -81,7 +76,7 @@ func (s *DisksV1) Insert(ctx context.Context, req *pb.InsertDiskRequest) (*pb.Op
}

if err := s.storage.Create(ctx, fqn, obj); err != nil {
return nil, status.Errorf(codes.Internal, "error creating disk: %v", err)
return nil, err
}

return s.newLRO(ctx, name.Project.ID)
Expand All @@ -98,10 +93,7 @@ func (s *DisksV1) Update(ctx context.Context, req *pb.UpdateDiskRequest) (*pb.Op
fqn := name.String()
obj := &pb.Disk{}
if err := s.storage.Get(ctx, fqn, obj); err != nil {
if apierrors.IsNotFound(err) {
return nil, status.Errorf(codes.NotFound, "disk %q not found", fqn)
}
return nil, status.Errorf(codes.Internal, "error reading disk: %v", err)
return nil, err
}

// TODO: Implement helper to implement the full rules here
Expand All @@ -125,11 +117,7 @@ func (s *DisksV1) Delete(ctx context.Context, req *pb.DeleteDiskRequest) (*pb.Op

deleted := (&pb.Disk{})
if err := s.storage.Delete(ctx, fqn, deleted); err != nil {
if apierrors.IsNotFound(err) {
return nil, status.Errorf(codes.NotFound, "disk %q not found", name)
} else {
return nil, status.Errorf(codes.Internal, "error deleting disk: %v", err)
}
return nil, err
}

return s.newLRO(ctx, name.Project.ID)
Expand Down
20 changes: 4 additions & 16 deletions mockgcp/mockcompute/regiondisksv1.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/proto"
apierrors "k8s.io/apimachinery/pkg/api/errors"

"github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp/common/projects"
pb "github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp/generated/mockgcp/cloud/compute/v1"
Expand All @@ -44,11 +43,7 @@ func (s *RegionalDisksV1) Get(ctx context.Context, req *pb.GetRegionDiskRequest)

obj := &pb.Disk{}
if err := s.storage.Get(ctx, fqn, obj); err != nil {
if apierrors.IsNotFound(err) {
return nil, status.Errorf(codes.NotFound, "disk %q not found", name)
} else {
return nil, status.Errorf(codes.Internal, "error reading disk: %v", err)
}
return nil, err
}

return obj, nil
Expand Down Expand Up @@ -81,7 +76,7 @@ func (s *RegionalDisksV1) Insert(ctx context.Context, req *pb.InsertRegionDiskRe
}

if err := s.storage.Create(ctx, fqn, obj); err != nil {
return nil, status.Errorf(codes.Internal, "error creating disk: %v", err)
return nil, err
}

return s.newLRO(ctx, name.Project.ID)
Expand All @@ -98,10 +93,7 @@ func (s *RegionalDisksV1) Update(ctx context.Context, req *pb.UpdateRegionDiskRe
fqn := name.String()
obj := &pb.Disk{}
if err := s.storage.Get(ctx, fqn, obj); err != nil {
if apierrors.IsNotFound(err) {
return nil, status.Errorf(codes.NotFound, "disk %q not found", fqn)
}
return nil, status.Errorf(codes.Internal, "error reading disk: %v", err)
return nil, err
}

// TODO: Implement helper to implement the full rules here
Expand All @@ -125,11 +117,7 @@ func (s *RegionalDisksV1) Delete(ctx context.Context, req *pb.DeleteRegionDiskRe

deleted := &pb.Disk{}
if err := s.storage.Delete(ctx, fqn, deleted); err != nil {
if apierrors.IsNotFound(err) {
return nil, status.Errorf(codes.NotFound, "disk %q not found", name)
} else {
return nil, status.Errorf(codes.Internal, "error deleting disk: %v", err)
}
return nil, err
}

return s.newLRO(ctx, name.Project.ID)
Expand Down
18 changes: 3 additions & 15 deletions mockgcp/mockresourcemanager/tagkeys.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"google.golang.org/grpc/status"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/klog/v2"

"github.com/GoogleCloudPlatform/k8s-config-connector/mockgcp/common/projects"
Expand All @@ -50,11 +49,7 @@ func (s *TagKeys) GetTagKey(ctx context.Context, req *pb.GetTagKeyRequest) (*pb.

obj := &pb.TagKey{}
if err := s.storage.Get(ctx, fqn, obj); err != nil {
if apierrors.IsNotFound(err) {
return nil, status.Errorf(codes.NotFound, "tagKey %q not found", name)
} else {
return nil, status.Errorf(codes.Internal, "error reading tagKey: %v", err)
}
return nil, err
}

// We should verify that this is part of on of our projects, but ... it's a mock
Expand Down Expand Up @@ -128,10 +123,7 @@ func (s *TagKeys) UpdateTagKey(ctx context.Context, req *pb.UpdateTagKeyRequest)
fqn := name.String()
obj := &pb.TagKey{}
if err := s.storage.Get(ctx, fqn, obj); err != nil {
if apierrors.IsNotFound(err) {
return nil, status.Errorf(codes.NotFound, "tagKey %q not found", reqName)
}
return nil, status.Errorf(codes.Internal, "error reading tagKey: %v", err)
return nil, err
}

// We should verify that this is part of on of our projects, but ... it's a mock
Expand Down Expand Up @@ -172,11 +164,7 @@ func (s *TagKeys) DeleteTagKey(ctx context.Context, req *pb.DeleteTagKeyRequest)

deleted := &pb.TagKey{}
if err := s.storage.Delete(ctx, fqn, deleted); err != nil {
if apierrors.IsNotFound(err) {
return nil, status.Errorf(codes.NotFound, "tagKey %q not found", name)
} else {
return nil, status.Errorf(codes.Internal, "error deleting tagKey: %v", err)
}
return nil, err
}

// We should verify that this is part of on of our projects, but ... it's a mock
Expand Down

0 comments on commit 320b1b8

Please sign in to comment.