Merge pull request #12 from gardener/provider-check

Updated the error codes
gardener · Apr 14, 2021 · a65a158 · a65a158
2 parents e056245 + b4aa7ff
commit a65a158
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/pkg/vsphere/machine_server.go b/pkg/vsphere/machine_server.go
@@ -68,7 +68,8 @@ func (ms *MachinePlugin) CreateMachine(ctx context.Context, req *driver.CreateMa
 
 	// check if the machineClass is of the supported provider
 	if req.MachineClass.Provider != Providervsphere {
-		return nil, fmt.Errorf("Requested provider is '%s'. We support only '%s'", req.MachineClass.Provider, Providervsphere)
+		err := fmt.Errorf("Requested provider is '%s'. We support only '%s'", req.MachineClass.Provider, Providervsphere)
+		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
 	providerSpec, err := decodeProviderSpecAndSecret(req.MachineClass, req.Secret)
@@ -110,7 +111,8 @@ func (ms *MachinePlugin) DeleteMachine(ctx context.Context, req *driver.DeleteMa
 
 	// check if the machineClass is of the supported provider
 	if req.MachineClass.Provider != Providervsphere {
-		return nil, fmt.Errorf("Requested provider is '%s'. We support only '%s'", req.MachineClass.Provider, Providervsphere)
+		err := fmt.Errorf("Requested provider is '%s'. We support only '%s'", req.MachineClass.Provider, Providervsphere)
+		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
 	providerSpec, err := decodeProviderSpecAndSecret(req.MachineClass, req.Secret)
@@ -150,7 +152,8 @@ func (ms *MachinePlugin) GetMachineStatus(ctx context.Context, req *driver.GetMa
 
 	// check if the machineClass is of the supported provider
 	if req.MachineClass.Provider != Providervsphere {
-		return nil, fmt.Errorf("Requested provider is '%s'. We support only '%s'", req.MachineClass.Provider, Providervsphere)
+		err := fmt.Errorf("Requested provider is '%s'. We support only '%s'", req.MachineClass.Provider, Providervsphere)
+		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
 	providerSpec, err := decodeProviderSpecAndSecret(req.MachineClass, req.Secret)
@@ -192,7 +195,8 @@ func (ms *MachinePlugin) ListMachines(ctx context.Context, req *driver.ListMachi
 
 	// check if the machineClass is of the supported provider
 	if req.MachineClass.Provider != Providervsphere {
-		return nil, fmt.Errorf("Requested provider is '%s'. We support only '%s'", req.MachineClass.Provider, Providervsphere)
+		err := fmt.Errorf("Requested provider is '%s'. We support only '%s'", req.MachineClass.Provider, Providervsphere)
+		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
 	providerSpec, err := decodeProviderSpecAndSecret(req.MachineClass, req.Secret)