Skip to content

Commit

Permalink
test: review
Browse files Browse the repository at this point in the history 
Signed-off-by: Marco Nenciarini <[email protected]>
  • Loading branch information
@mnencia
mnencia committed Oct 31, 2024
1 parent 9695f5d commit 74df169
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 30 deletions.
3 changes: 2 additions & 1 deletion api/v1/publication_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,14 @@ type PublicationSpec struct {
// +kubebuilder:validation:XValidation:rule="(has(self.allTables) && !has(self.objects)) || (!has(self.allTables) && has(self.objects))",message="allTables and objects are mutually exclusive"
type PublicationTarget struct {
// All tables should be published
// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="allTables is immutable"
// +optional
AllTables bool `json:"allTables,omitempty"`

// Just the following schema objects
// +optional
// +kubebuilder:validation:XValidation:rule="!(self.exists(o, has(o.table) && has(o.table.columns)) && self.exists(o, has(o.tablesInSchema)))",message="specifying a column list when the publication also publishes tablesInSchema is not supported"
// +kubebuilder:validation:MaxItems=100000
// +optional
Objects []PublicationTargetObject `json:"objects,omitempty"`
}

Expand Down
3 changes: 3 additions & 0 deletions config/crd/bases/postgresql.cnpg.io_publications.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ spec:
allTables:
description: All tables should be published
type: boolean
x-kubernetes-validations:
- message: allTables is immutable
rule: self == oldSelf
objects:
description: Just the following schema objects
items:
Expand Down
18 changes: 10 additions & 8 deletions internal/management/controller/publication_controller_sql_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ var _ = Describe("publication sql", func() {
}

sqls := toPublicationAlterSQL(obj)
Expect(sqls).To(ContainElement("ALTER PUBLICATION \"test_pub\" SET TABLES IN SCHEMA \"public\""))
Expect(sqls).To(ContainElement(`ALTER PUBLICATION "test_pub" SET TABLES IN SCHEMA "public"`))
})

It("generates correct SQL for altering publication with owner", func() {
Expand All @@ -98,7 +98,7 @@ var _ = Describe("publication sql", func() {
}

sqls := toPublicationAlterSQL(obj)
Expect(sqls).To(ContainElement("ALTER PUBLICATION \"test_pub\" OWNER TO \"new_owner\""))
Expect(sqls).To(ContainElement(`ALTER PUBLICATION "test_pub" OWNER TO "new_owner"`))
})

It("generates correct SQL for altering publication with parameters", func() {
Expand All @@ -113,7 +113,7 @@ var _ = Describe("publication sql", func() {
}

sqls := toPublicationAlterSQL(obj)
Expect(sqls).To(ContainElement("ALTER PUBLICATION \"test_pub\" SET (param1 = 'value1', param2 = 'value2')"))
Expect(sqls).To(ContainElement(`ALTER PUBLICATION "test_pub" SET (param1 = 'value1', param2 = 'value2')`))
})

It("returns empty SQL list when no alterations are needed", func() {
Expand All @@ -140,7 +140,7 @@ var _ = Describe("publication sql", func() {
}

sqls := toPublicationCreateSQL(obj)
Expect(sqls).To(ContainElement("CREATE PUBLICATION \"test_pub\" FOR TABLES IN SCHEMA \"public\""))
Expect(sqls).To(ContainElement(`CREATE PUBLICATION "test_pub" FOR TABLES IN SCHEMA "public"`))
})

It("generates correct SQL for creating publication with target table", func() {
Expand All @@ -162,13 +162,15 @@ var _ = Describe("publication sql", func() {
It("generates correct SQL for creating publication with owner", func() {
obj := &apiv1.Publication{
Spec: apiv1.PublicationSpec{
Name: "test_pub",
Owner: "new_owner",
Name: "test_pub",
Owner: "new_owner",
Target: apiv1.PublicationTarget{AllTables: true},
},
}

sqls := toPublicationCreateSQL(obj)
Expect(sqls).To(ContainElement("ALTER PUBLICATION \"test_pub\" OWNER to \"new_owner\""))
Expect(sqls).To(ContainElement(`CREATE PUBLICATION "test_pub" FOR ALL TABLES`))
Expect(sqls).To(ContainElement(`ALTER PUBLICATION "test_pub" OWNER to "new_owner"`))
})

It("generates correct SQL for creating publication with parameters", func() {
Expand All @@ -189,7 +191,7 @@ var _ = Describe("publication sql", func() {

sqls := toPublicationCreateSQL(obj)
Expect(sqls).To(ContainElement(
"CREATE PUBLICATION \"test_pub\" FOR TABLES IN SCHEMA \"public\" WITH (param1 = 'value1', param2 = 'value2')",
`CREATE PUBLICATION "test_pub" FOR TABLES IN SCHEMA "public" WITH (param1 = 'value1', param2 = 'value2')`,
))
})
})
34 changes: 17 additions & 17 deletions internal/management/controller/subscription_controller_sql_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ var _ = Describe("subscription sql", func() {

sqls := toSubscriptionCreateSQL(obj, connString)
Expect(sqls).To(ContainElement(
"CREATE SUBSCRIPTION \"test_sub\" CONNECTION 'host=localhost user=test dbname=test' PUBLICATION \"test_pub\""))
`CREATE SUBSCRIPTION "test_sub" CONNECTION 'host=localhost user=test dbname=test' PUBLICATION "test_pub"`))
})

It("generates correct SQL for creating subscription with parameters", func() {
Expand All @@ -100,9 +100,9 @@ var _ = Describe("subscription sql", func() {
connString := "host=localhost user=test dbname=test"

sqls := toSubscriptionCreateSQL(obj, connString)
expectedElement := "CREATE SUBSCRIPTION \"test_sub\" " +
"CONNECTION 'host=localhost user=test dbname=test' " +
"PUBLICATION \"test_pub\" WITH (param1 = 'value1', param2 = 'value2')"
expectedElement := `CREATE SUBSCRIPTION "test_sub" ` +
`CONNECTION 'host=localhost user=test dbname=test' ` +
`PUBLICATION "test_pub" WITH (param1 = 'value1', param2 = 'value2')`
Expect(sqls).To(ContainElement(expectedElement))
})

Expand All @@ -118,8 +118,8 @@ var _ = Describe("subscription sql", func() {

sqls := toSubscriptionCreateSQL(obj, connString)
Expect(sqls).To(ContainElement(
"CREATE SUBSCRIPTION \"test_sub\" CONNECTION 'host=localhost user=test dbname=test' PUBLICATION \"test_pub\""))
Expect(sqls).To(ContainElement("ALTER SUBSCRIPTION \"test_sub\" OWNER TO \"new_owner\""))
`CREATE SUBSCRIPTION "test_sub" CONNECTION 'host=localhost user=test dbname=test' PUBLICATION "test_pub"`))
Expect(sqls).To(ContainElement(`ALTER SUBSCRIPTION "test_sub" OWNER TO "new_owner"`))
})

It("returns correct SQL for creating subscription with no owner or parameters", func() {
Expand All @@ -133,7 +133,7 @@ var _ = Describe("subscription sql", func() {

sqls := toSubscriptionCreateSQL(obj, connString)
Expect(sqls).To(ContainElement(
"CREATE SUBSCRIPTION \"test_sub\" CONNECTION 'host=localhost user=test dbname=test' PUBLICATION \"test_pub\""))
`CREATE SUBSCRIPTION "test_sub" CONNECTION 'host=localhost user=test dbname=test' PUBLICATION "test_pub"`))
})

It("generates correct SQL for altering subscription with publication and connection string", func() {
Expand All @@ -146,8 +146,8 @@ var _ = Describe("subscription sql", func() {
connString := "host=localhost user=test dbname=test"

sqls := toSubscriptionAlterSQL(obj, connString)
Expect(sqls).To(ContainElement("ALTER SUBSCRIPTION \"test_sub\" SET PUBLICATION \"test_pub\""))
Expect(sqls).To(ContainElement("ALTER SUBSCRIPTION \"test_sub\" CONNECTION 'host=localhost user=test dbname=test'"))
Expect(sqls).To(ContainElement(`ALTER SUBSCRIPTION "test_sub" SET PUBLICATION "test_pub"`))
Expect(sqls).To(ContainElement(`ALTER SUBSCRIPTION "test_sub" CONNECTION 'host=localhost user=test dbname=test'`))
})

It("generates correct SQL for altering subscription with owner", func() {
Expand All @@ -161,9 +161,9 @@ var _ = Describe("subscription sql", func() {
connString := "host=localhost user=test dbname=test"

sqls := toSubscriptionAlterSQL(obj, connString)
Expect(sqls).To(ContainElement("ALTER SUBSCRIPTION \"test_sub\" SET PUBLICATION \"test_pub\""))
Expect(sqls).To(ContainElement("ALTER SUBSCRIPTION \"test_sub\" CONNECTION 'host=localhost user=test dbname=test'"))
Expect(sqls).To(ContainElement("ALTER SUBSCRIPTION \"test_sub\" OWNER TO \"new_owner\""))
Expect(sqls).To(ContainElement(`ALTER SUBSCRIPTION "test_sub" SET PUBLICATION "test_pub"`))
Expect(sqls).To(ContainElement(`ALTER SUBSCRIPTION "test_sub" CONNECTION 'host=localhost user=test dbname=test'`))
Expect(sqls).To(ContainElement(`ALTER SUBSCRIPTION "test_sub" OWNER TO "new_owner"`))
})

It("generates correct SQL for altering subscription with parameters", func() {
Expand All @@ -180,9 +180,9 @@ var _ = Describe("subscription sql", func() {
connString := "host=localhost user=test dbname=test"

sqls := toSubscriptionAlterSQL(obj, connString)
Expect(sqls).To(ContainElement("ALTER SUBSCRIPTION \"test_sub\" SET PUBLICATION \"test_pub\""))
Expect(sqls).To(ContainElement("ALTER SUBSCRIPTION \"test_sub\" CONNECTION 'host=localhost user=test dbname=test'"))
Expect(sqls).To(ContainElement("ALTER SUBSCRIPTION \"test_sub\" SET (param1 = 'value1', param2 = 'value2')"))
Expect(sqls).To(ContainElement(`ALTER SUBSCRIPTION "test_sub" SET PUBLICATION "test_pub"`))
Expect(sqls).To(ContainElement(`ALTER SUBSCRIPTION "test_sub" CONNECTION 'host=localhost user=test dbname=test'`))
Expect(sqls).To(ContainElement(`ALTER SUBSCRIPTION "test_sub" SET (param1 = 'value1', param2 = 'value2')`))
})

It("returns correct SQL for altering subscription with no owner or parameters", func() {
Expand All @@ -195,7 +195,7 @@ var _ = Describe("subscription sql", func() {
connString := "host=localhost user=test dbname=test"

sqls := toSubscriptionAlterSQL(obj, connString)
Expect(sqls).To(ContainElement("ALTER SUBSCRIPTION \"test_sub\" SET PUBLICATION \"test_pub\""))
Expect(sqls).To(ContainElement("ALTER SUBSCRIPTION \"test_sub\" CONNECTION 'host=localhost user=test dbname=test'"))
Expect(sqls).To(ContainElement(`ALTER SUBSCRIPTION "test_sub" SET PUBLICATION "test_pub"`))
Expect(sqls).To(ContainElement(`ALTER SUBSCRIPTION "test_sub" CONNECTION 'host=localhost user=test dbname=test'`))
})
})
5 changes: 1 addition & 4 deletions internal/management/controller/subscription_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ var _ = Describe("Conversion of PG parameters from map to string of key/value pa
"a": "1", "b": "2",
}
res := toPostgresParameters(m)
Expect(res).To(BeElementOf([]string{
`a = '1', b = '2'`,
`b = '2', a = '1'`,
}))
Expect(res).To(Equal(`a = '1', b = '2'`))
})
})

0 comments on commit 74df169

Please sign in to comment.