Browse Source

porter apply (#3374)

Co-authored-by: David Townley <davidtownley@Davids-MacBook-Air.local>
d-g-town 2 năm trước cách đây
mục cha
commit
68ebc79353

+ 1 - 1
api/server/handlers/porter_app/conversion/porter_yaml.go

@@ -123,7 +123,7 @@ func AppProtoFromYaml(file []byte) (map[string]*porterv1.PorterApp, error) {
 			if err != nil {
 				return nil, telemetry.Error(ctx, span, err, "error casting release config")
 			}
-			validApp.Release = release
+			validApp.Predeploy = release
 		}
 
 		validatedApps[app.Name] = validApp

+ 3 - 3
go.mod

@@ -52,7 +52,7 @@ require (
 	google.golang.org/api v0.103.0
 	google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd
 	google.golang.org/grpc v1.52.0
-	google.golang.org/protobuf v1.30.0
+	google.golang.org/protobuf v1.31.0
 	gorm.io/gorm v1.24.2
 	k8s.io/api v0.26.0
 	k8s.io/apimachinery v0.26.0
@@ -78,7 +78,7 @@ require (
 	github.com/honeycombio/otel-launcher-go v0.2.0
 	github.com/nats-io/nats.go v1.24.0
 	github.com/open-policy-agent/opa v0.44.0
-	github.com/porter-dev/api-contracts v0.0.75
+	github.com/porter-dev/api-contracts v0.0.81
 	github.com/riandyrn/otelchi v0.5.1
 	github.com/santhosh-tekuri/jsonschema/v5 v5.0.1
 	github.com/stefanmcshane/helm v0.0.0-20221213002717-88a4a2c6e77d
@@ -216,7 +216,7 @@ require (
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/gdamore/tcell/v2 v2.5.1 // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
+	github.com/ghodss/yaml v1.0.0
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect

+ 4 - 4
go.sum

@@ -1494,8 +1494,8 @@ github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/polyfloyd/go-errorlint v0.0.0-20210722154253-910bb7978349/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw=
-github.com/porter-dev/api-contracts v0.0.75 h1:Koje0VJLlQ1Nxw25N4IcaK1nqDlPpktAM5Jzrkd0yRA=
-github.com/porter-dev/api-contracts v0.0.75/go.mod h1:qr2L58mJLr5DUGV5OPw3REiSrQvJq6TgkKyEWP95dyU=
+github.com/porter-dev/api-contracts v0.0.81 h1:cFl8sa9aANSBy1lvxKAhLjTZYvxqUtTOt3AZ3UL+y/g=
+github.com/porter-dev/api-contracts v0.0.81/go.mod h1:fX6JmP5QuzxDLvqP3evFOTXjI4dHxsG0+VKNTjImZU8=
 github.com/porter-dev/switchboard v0.0.3 h1:dBuYkiVLa5Ce7059d6qTe9a1C2XEORFEanhbtV92R+M=
 github.com/porter-dev/switchboard v0.0.3/go.mod h1:xSPzqSFMQ6OSbp42fhCi4AbGbQbsm6nRvOkrblFeXU4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
@@ -2550,8 +2550,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

+ 6 - 3
internal/models/deployment_target.go

@@ -9,7 +9,7 @@ type DeploymentTarget struct {
 	gorm.Model
 
 	// ID is a UUID for the Revision
-	ID uuid.UUID `gorm:"type:uuid;primaryKey" json:"id"` 
+	ID uuid.UUID `gorm:"type:uuid;primaryKey" json:"id"`
 
 	// ClusterID is the ID of the cluster that is being targeted.
 	ClusterID int `json:"cluster_id"`
@@ -17,6 +17,9 @@ type DeploymentTarget struct {
 	// ProjectID is the ID of the project that the target belongs to.
 	ProjectID int `json:"project_id"`
 
-	// Selector is the identifier to target, such as a namespace or a label selector.
+	// Selector is the identifier to target.
 	Selector string `json:"selector"`
-}
+
+	// SelectorType is the kind of selector (i.e. NAMESPACE or LABEL).
+	SelectorType string `json:"selector_type"`
+}