Skip to content

Commit 8224e52

Browse files
feat: adopt shared plugin authoring APIs
1 parent 14bf45e commit 8224e52

5 files changed

Lines changed: 28 additions & 39 deletions

File tree

‎agent.codefly.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
publisher: codefly.dev
22
kind: codefly:service
33
name: python-fastapi
4-
version: 0.0.90
4+
version: 0.0.91

‎builder.go‎

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -227,41 +227,15 @@ type Parameters struct{}
227227
func (s *Builder) Deploy(ctx context.Context, req *builderv0.DeploymentRequest) (*builderv0.DeploymentResponse, error) {
228228
defer s.Wool.Catch()
229229

230-
s.Base.Builder.LogDeployRequest(req, s.Wool.Debug)
231-
s.EnvironmentVariables.SetRunning()
232-
233-
k, err := s.Base.Builder.KubernetesDeploymentRequest(ctx, req)
234-
if err != nil {
235-
return s.Base.Builder.DeployError(err)
236-
}
237-
if err := s.EnvironmentVariables.AddConfigurations(ctx, req.Configuration); err != nil {
238-
return s.Base.Builder.DeployError(err)
239-
}
240-
if err := s.EnvironmentVariables.AddConfigurations(ctx, req.DependenciesConfigurations...); err != nil {
241-
return s.Base.Builder.DeployError(err)
242-
}
243-
244-
confs, err := s.EnvironmentVariables.Configurations()
245-
if err != nil {
246-
return s.Base.Builder.DeployError(err)
247-
}
248-
cm, err := services.EnvsAsConfigMapData(confs...)
249-
if err != nil {
250-
return s.Base.Builder.DeployError(err)
251-
}
252-
secrets, err := services.EnvsAsSecretData(s.EnvironmentVariables.Secrets()...)
253-
if err != nil {
254-
return s.Base.Builder.DeployError(err)
255-
}
256-
params := services.DeploymentParameters{
257-
ConfigMap: cm,
258-
SecretMap: secrets,
230+
return s.Base.Builder.DeployKustomize(ctx, req, services.KustomizeDeployment{
231+
EnvironmentVariables: s.EnvironmentVariables,
232+
Templates: deploymentFS,
233+
Inputs: services.DeploymentInputs{
234+
OwnConfiguration: true,
235+
DependencyConfigurations: true,
236+
},
259237
Parameters: Parameters{},
260-
}
261-
if err := s.Base.Builder.KustomizeDeploy(ctx, req.Environment, k, deploymentFS, params); err != nil {
262-
return s.Base.Builder.DeployError(err)
263-
}
264-
return s.Base.Builder.DeployResponse()
238+
})
265239
}
266240

267241
// Options returns the two-question set shown during `codefly add service`.

‎deployment_test.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package main
2+
3+
import (
4+
"testing"
5+
6+
agenttesting "github.com/codefly-dev/core/agents/testing"
7+
)
8+
9+
func TestDeploymentTemplates(t *testing.T) {
10+
agenttesting.AssertKustomizeTemplates(t, deploymentFS, Parameters{})
11+
}

‎go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.25.0
55
toolchain go1.26.4
66

77
require (
8-
github.com/codefly-dev/core v0.2.10
9-
github.com/codefly-dev/service-python v0.0.1
8+
github.com/codefly-dev/core v0.2.18
9+
github.com/codefly-dev/service-python v0.0.10
1010
github.com/stretchr/testify v1.11.1
1111
google.golang.org/grpc v1.80.0
1212
gopkg.in/yaml.v3 v3.0.1
@@ -17,6 +17,7 @@ require (
1717
buf.build/go/protovalidate v1.2.0 // indirect
1818
cel.dev/expr v0.25.1 // indirect
1919
dario.cat/mergo v1.0.2 // indirect
20+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2021
github.com/Masterminds/semver v1.5.0 // indirect
2122
github.com/Microsoft/go-winio v0.6.2 // indirect
2223
github.com/ProtonMail/go-crypto v1.4.1 // indirect

‎go.sum‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJ
3737
github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
3838
github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
3939
github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
40+
github.com/codefly-dev/core v0.2.18 h1:vcY5iIm1nrs672eDFv+BFctPhWjaDCNqctm5ycWpOdk=
41+
github.com/codefly-dev/core v0.2.18/go.mod h1:78gNY4qIlPnj08Fe8X5WwXWtqjTvU4MelJlOYTJq/5s=
4042
github.com/codefly-dev/gortk v0.2.0 h1:7bOlS5valYz2zil+fZctQNcPCYBcPj86abcw9N8h1hQ=
4143
github.com/codefly-dev/gortk v0.2.0/go.mod h1:dDWUMFgAP063OCGhTEpV7FFUj9+zTcxxO/nV80VKEwg=
42-
github.com/codefly-dev/service-python v0.0.1 h1:asSY/6l/jlYfFN+ZsOqJAktR1Q0Bg22FT+aPQKesU4I=
43-
github.com/codefly-dev/service-python v0.0.1/go.mod h1:nfBAa/1ynJL9JXxyJe2n2i95l4kWNuyni0PLpADuK3c=
44+
github.com/codefly-dev/service-python v0.0.10 h1:mgkUrhkyBCkwAWO6BF60Y3vZH72TQ5ckVv/ZY324L1Y=
45+
github.com/codefly-dev/service-python v0.0.10/go.mod h1:VdvuG4+uZr/GEP4EKT5aQtiSr/x+B80776m8jW0Gz2k=
4446
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
4547
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
4648
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
@@ -284,6 +286,7 @@ golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7w
284286
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
285287
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
286288
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
289+
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
287290
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
288291
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
289292
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=

0 commit comments

Comments
 (0)