Skip to content

Commit 77a0ab5

Browse files
Add Missing Optional Annotation for Port (#288)
* add optional label Signed-off-by: Stephen Hwang <[email protected]> * add migration Signed-off-by: Stephen Hwang <[email protected]> * fix merge conflictsg Signed-off-by: Stephen Hwang <[email protected]> * fix lint Signed-off-by: Stephen Hwang <[email protected]> --------- Signed-off-by: Stephen Hwang <[email protected]>
1 parent 9f8e7ee commit 77a0ab5

21 files changed

+192
-53
lines changed

cmd/serve.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var (
5050
var serveCmd = &cobra.Command{
5151
Use: "serve",
5252
Short: "Start the load balancer Graph API",
53-
RunE: func(cmd *cobra.Command, args []string) error {
53+
RunE: func(cmd *cobra.Command, _ []string) error {
5454
if pidFileName != "" {
5555
if err := writePidFile(pidFileName); err != nil {
5656
logger.Error("failed to write pid file", zap.Error(err))
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-- +goose Up
2+
-- modify "ports" table
3+
ALTER TABLE "ports" ALTER COLUMN "name" DROP NOT NULL;
4+
5+
-- +goose Down
6+
-- reverse: modify "ports" table
7+
ALTER TABLE "ports" ALTER COLUMN "name" SET NOT NULL;

db/migrations/atlas.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
h1:0KtiTooJCnoUsSF1CYnlRKEVEQFmH2Fj55S/41WmJr8=
1+
h1:MujJgh8ifO4DK4QeukfFWRsa5OFI9Q0agyQwNlkI/3Q=
22
20230503185445_initial-migration.sql h1:4pqNp2MDBBRdGxU/H5mmZui9oi1SyjIiMVGatajrBeY=
33
20230615194819_drop_tenant_add_owner.sql h1:KGCsItU0NYhxYEkhZOaMQjfIrBMnek5rxC6D/LhnyCk=
44
20230629085916_drop_status_and_annotations.sql h1:kvDMoaMEjyoj/aRi6rw4XvCLxGH09vGGLbL0/p5tpPo=
55
20231017005257_add_origin_weight.sql h1:NuorUbcydDqcyPK8wgwlkQxaH+zGWfVtJW9UPL1Vn+E=
66
20240207205734_audit-fields.sql h1:cplFCBB7laCP5Y+UAoxIfITMo56Hoc5XIVvgcfGL9o0=
77
20240208121103_softdelete.sql h1:rt3nHn/1KzxSAbJZ33fQJZi5emLk7Q2PCRcfxWUeveY=
8+
20240214095509_change_port_name_optional.sql h1:ArlIsVK4Tgi6AW6NiRMbAqU43+5KFqDkaa+YmxSoBkE=

internal/ent/generated/gql_mutation_input.go

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ent/generated/gql_where_input.go

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ent/generated/migrate/schema.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ent/generated/mutation.go

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ent/generated/port/where.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ent/generated/port_create.go

Lines changed: 8 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ent/generated/port_update.go

Lines changed: 34 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/ent/schema/port.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ func (Port) Fields() []ent.Field {
5454
field.String("name").
5555
Annotations(
5656
entgql.OrderField("name"),
57-
),
57+
).
58+
Optional(),
5859
field.String("load_balancer_id").
5960
GoType(gidx.PrefixedID("")).
6061
Immutable().

internal/graphapi/gen_server.go

Lines changed: 36 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/graphapi/loadbalancer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ func TestFullLoadBalancerLifecycle(t *testing.T) {
397397
assert.Equal(t, ownerID, createdLB.Owner.ID)
398398

399399
createdPortResp, err := graphTestClient().LoadBalancerPortCreate(ctx, graphclient.CreateLoadBalancerPortInput{
400-
Name: gofakeit.DomainName(),
400+
Name: newString(gofakeit.DomainName()),
401401
Number: 8080,
402402
LoadBalancerID: createdLB.ID,
403403
})

0 commit comments

Comments
 (0)