Prechádzať zdrojové kódy

properly error on missing service type (#4042)

d-g-town 2 rokov pred
rodič
commit
9c2c0f0ba6

+ 2 - 2
internal/porter_app/v1/yaml.go

@@ -102,7 +102,7 @@ func AppProtoFromYaml(ctx context.Context, porterYamlBytes []byte) (*porterv1.Po
 }
 
 func protoEnumFromType(name string, service Service) porterv1.ServiceType {
-	serviceType := porterv1.ServiceType_SERVICE_TYPE_WORKER
+	serviceType := porterv1.ServiceType_SERVICE_TYPE_UNSPECIFIED
 
 	if strings.Contains(name, "web") {
 		serviceType = porterv1.ServiceType_SERVICE_TYPE_WEB
@@ -202,7 +202,7 @@ func serviceProtoFromConfig(service Service, serviceType porterv1.ServiceType) (
 	default:
 		return nil, fmt.Errorf("invalid service type '%s'", serviceType)
 	case porterv1.ServiceType_SERVICE_TYPE_UNSPECIFIED:
-		return nil, errors.New("KubernetesService type unspecified")
+		return nil, errors.New("service type unspecified")
 	case porterv1.ServiceType_SERVICE_TYPE_WEB:
 		webConfig, err := webConfigProtoFromConfig(service)
 		if err != nil {

+ 1 - 1
internal/porter_app/v2/yaml.go

@@ -303,7 +303,7 @@ func ProtoFromApp(ctx context.Context, porterApp PorterApp) (*porterv1.PorterApp
 }
 
 func protoEnumFromType(name string, service Service) porterv1.ServiceType {
-	serviceType := porterv1.ServiceType_SERVICE_TYPE_WORKER
+	serviceType := porterv1.ServiceType_SERVICE_TYPE_UNSPECIFIED
 
 	if strings.Contains(name, "web") {
 		serviceType = porterv1.ServiceType_SERVICE_TYPE_WEB