update: changes

Author: Antoine Toussaint

builder.go

@@ -159,7 +159,13 @@ func (s *Builder) Deploy(ctx context.Context, req *builderv0.DeploymentRequest)
 
 	s.EnvironmentVariables.SetRunning(true)
 
-	err := s.EnvironmentVariables.AddConfigurations(req.Configuration)
+	var k *builderv0.KubernetesDeployment
+	var err error
+	if k, err = s.Builder.KubernetesDeploymentRequest(ctx, req); err != nil {
+		return s.Builder.DeployError(err)
+	}
+
+	err = s.EnvironmentVariables.AddConfigurations(req.Configuration)
 	if err != nil {
 		return s.Builder.DeployError(err)
 	}
@@ -183,10 +189,6 @@ func (s *Builder) Deploy(ctx context.Context, req *builderv0.DeploymentRequest)
 		SecretMap: secrets,
 	}
 
-	var k *builderv0.KubernetesDeployment
-	if k, err = s.Builder.KubernetesDeploymentRequest(ctx, req); err != nil {
-		return s.Builder.DeployError(err)
-	}
 	err = s.Builder.KustomizeDeploy(ctx, req.Environment, k, deploymentFS, params)
 	if err != nil {
 		return s.Builder.DeployError(err)

go.sum

@@ -14,16 +14,12 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
 github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8=
-github.com/bufbuild/protovalidate-go v0.6.0 h1:Jgs1kFuZ2LHvvdj8SpCLA1W/+pXS8QSM3F/E2l3InPY=
-github.com/bufbuild/protovalidate-go v0.6.0/go.mod h1:1LamgoYHZ2NdIQH0XGczGTc6Z8YrTHjcJVmiBaar4t4=
 github.com/bufbuild/protovalidate-go v0.6.1 h1:uzW8r0CDvqApUChNj87VzZVoQSKhcVdw5UWOE605UIw=
 github.com/bufbuild/protovalidate-go v0.6.1/go.mod h1:4BR3rKEJiUiTy+sqsusFn2ladOf0kYmA2Reo6BHSBgQ=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
 github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cheggaaa/pb/v3 v3.1.5 h1:QuuUzeM2WsAqG2gMqtzaWithDJv0i+i6UlnwSCI4QLk=
 github.com/cheggaaa/pb/v3 v3.1.5/go.mod h1:CrxkeghYTXi1lQBEI7jSn+3svI3cuc19haAj6jM60XI=
-github.com/codefly-dev/core v0.1.73 h1:CUKsqyjh2ej2yJ/BWDxRQU4cbInopAcbKyAf7R8qqVA=
-github.com/codefly-dev/core v0.1.73/go.mod h1:mZ5m3VQYixwPHF/0+b6+D3M1XwtQG4ugxwXSTPs5A64=
 github.com/codefly-dev/core v0.1.74 h1:Fx8+drWvqvlkdZT9TUXPnM5TyILEaaJ1o7c5WuMsYyc=
 github.com/codefly-dev/core v0.1.74/go.mod h1:mZ5m3VQYixwPHF/0+b6+D3M1XwtQG4ugxwXSTPs5A64=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
@@ -105,8 +101,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHg
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I=
-github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
 github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=

runtime.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	basev0 "github.com/codefly-dev/core/generated/go/base/v0"
 	"github.com/codefly-dev/core/shared"
 	"github.com/hashicorp/go-multierror"
 	"path"
@@ -23,6 +24,7 @@ import (
 
 type Runtime struct {
 	*Service
+	Environment *basev0.Environment
 
 	// internal
 	runner       runners.Runner
@@ -297,31 +299,31 @@ func (s *Runtime) Information(ctx context.Context, req *runtimev0.InformationReq
 
 func (s *Runtime) Stop(ctx context.Context, req *runtimev0.StopRequest) (*runtimev0.StopResponse, error) {
 	defer s.Wool.Catch()
-	var combined error
+	var agg error
 	s.Wool.Debug("stopping service")
-	for _, runner := range s.otherRunners {
-		err := runner.Stop()
+	if s.runner != nil {
+		err := s.runner.Stop()
 		if err != nil {
-			s.Wool.Warn("cannot kill runner", wool.ErrField(err))
-			combined = multierror.Append(combined, err)
+			agg = multierror.Append(agg, err)
 		}
-
 	}
-	err := s.runner.Stop()
-	if err != nil {
+	for _, run := range s.otherRunners {
+		err := run.Stop()
 		if err != nil {
-			s.Wool.Warn("cannot kill runner", wool.ErrField(err))
-			combined = multierror.Append(combined, err)
+			agg = multierror.Append(agg, err)
+			s.Wool.Warn("error stopping runner", wool.ErrField(err))
 		}
 	}
-
-	err = s.Base.Stop()
+	s.Wool.Debug("runner stopped")
+	err := s.Base.Stop()
 	if err != nil {
-		s.Wool.Warn("cannot kill runner", wool.ErrField(err))
-		combined = multierror.Append(combined, err)
+		if err != nil {
+			agg = multierror.Append(agg, err)
+			s.Wool.Warn("error stopping runner", wool.ErrField(err))
+		}
 	}
-	if combined != nil {
-		return s.Runtime.StopError(combined)
+	if agg != nil {
+		return s.Base.Runtime.StopError(agg)
 	}
 	return s.Runtime.StopResponse()
 }

templates/factory/src/openapi.py.tmpl

@@ -13,5 +13,5 @@ if __name__ == "__main__":
     )
     app.openapi_schema = openapi_schema
     openapi = app.openapi()
-    with open("../openapi/api.swagger.json", "w") as f:
+    with open("../openapi/api.json", "w") as f:
         f.write(json.dumps(openapi))