File tree Expand file tree Collapse file tree 5 files changed +264
-79
lines changed
Expand file tree Collapse file tree 5 files changed +264
-79
lines changed Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ require (
1414 github.com/fatih/color v1.18.0
1515 github.com/google/go-cmp v0.7.0
1616 github.com/kong/go-apiops v0.2.2
17- github.com/kong/go-database-reconciler v1.31.7-0.20260302110444-ed9ab212d32f
17+ github.com/kong/go-database-reconciler v1.31.7-0.20260303125506-b6540e513c57
1818 github.com/kong/go-kong v0.72.1
1919 github.com/mitchellh/go-homedir v1.1.0
2020 github.com/spf13/cobra v1.9.1
Original file line number Diff line number Diff line change @@ -247,8 +247,8 @@ github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/q
247247github.com/klauspost/cpuid/v2 v2.2.5 /go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws =
248248github.com/kong/go-apiops v0.2.2 h1:Owdcl/PxTdtciqyZKgPScVhTKHgY2b8dGIC1Bms8NpI =
249249github.com/kong/go-apiops v0.2.2 /go.mod h1:yPwbl3P2eQinVGAEA0d3legaYmzPJ+WtJf9fSeGF4b8 =
250- github.com/kong/go-database-reconciler v1.31.7-0.20260302110444-ed9ab212d32f h1:V2f/loHXw5ERcIkgrO+tchXl/z0kX3R30SX2ESVCF+o =
251- github.com/kong/go-database-reconciler v1.31.7-0.20260302110444-ed9ab212d32f /go.mod h1:A6BBhnK1AQ7mQAsnLHoAitS62nJRGqUI8NbjC1aRGOc =
250+ github.com/kong/go-database-reconciler v1.31.7-0.20260303125506-b6540e513c57 h1:E0gTrgPsGUuqBn15tBSehc2sKrEZNiI8IyP5C/kNmIw =
251+ github.com/kong/go-database-reconciler v1.31.7-0.20260303125506-b6540e513c57 /go.mod h1:A6BBhnK1AQ7mQAsnLHoAitS62nJRGqUI8NbjC1aRGOc =
252252github.com/kong/go-kong v0.72.1 h1:rQ69f3Wd0Fvc3JANkavo34vePqR4uZG/YQ2y5U7d2Po =
253253github.com/kong/go-kong v0.72.1 /go.mod h1:J0vGB3wsZ2i99zly1zTRe3v7rOKpkhQZRwbcTFP76qM =
254254github.com/kong/go-slugify v1.0.0 h1:vCFAyf2sdoSlBtLcrmDWUFn0ohlpKiKvQfXZkO5vSKY =
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ package integration
44
55import (
66 "context"
7+ "os"
78 "testing"
89
910 "github.com/google/go-cmp/cmp"
@@ -133,11 +134,27 @@ func Test_Apply_3x(t *testing.T) {
133134 })
134135}
135136
137+ func Test_Apply_Custom_Entities (t * testing.T ) {
138+ runWhenEnterpriseOrKonnect (t , ">=3.0.0" )
139+
140+ // Check if running against Konnect for dual testing
141+ isKonnect := os .Getenv ("DECK_KONNECT_EMAIL" ) != "" ||
142+ os .Getenv ("DECK_KONNECT_PASSWORD" ) != "" ||
143+ os .Getenv ("DECK_KONNECT_TOKEN" ) != ""
144+
145+ if isKonnect {
146+ runDualTestWithSkipDefaults (t , "Test_Apply_Custom_Entities" ,
147+ testApplyCustomEntitiesImpl )
148+ } else {
149+ // For Enterprise: run once
150+ testApplyCustomEntitiesImpl (t )
151+ }
152+ }
153+
136154// test scope:
137155// - enterprise: >=3.0.0
138156// - konnect
139- func Test_Apply_Custom_Entities (t * testing.T ) {
140- runWhenEnterpriseOrKonnect (t , ">=3.0.0" )
157+ func testApplyCustomEntitiesImpl (t * testing.T ) {
141158 setup (t )
142159
143160 ctx := context .Background ()
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ package integration
44
55import (
66 "context"
7+ "os"
78 "testing"
89
910 "github.com/kong/go-database-reconciler/pkg/utils"
@@ -903,11 +904,23 @@ func Test_Diff_NoDiffCompressedTarget(t *testing.T) {
903904}
904905
905906func Test_Diff_Consumers_Default_Lookup_Tag (t * testing.T ) {
906- runDualTestWithSkipDefaults (t , "Test_Diff_Consumers_Default_Lookup_Tag" , testDiffConsumersDefaultLookupTagImpl )
907+ runWhenEnterpriseOrKonnect (t , ">=3.0.0" )
908+
909+ // Check if running against Konnect for dual testing
910+ isKonnect := os .Getenv ("DECK_KONNECT_EMAIL" ) != "" ||
911+ os .Getenv ("DECK_KONNECT_PASSWORD" ) != "" ||
912+ os .Getenv ("DECK_KONNECT_TOKEN" ) != ""
913+
914+ if isKonnect {
915+ runDualTestWithSkipDefaults (t , "Test_Diff_Consumers_Default_Lookup_Tag" ,
916+ testDiffConsumersDefaultLookupTagImpl )
917+ } else {
918+ // For Enterprise: run once
919+ testDiffConsumersDefaultLookupTagImpl (t )
920+ }
907921}
908922
909923func testDiffConsumersDefaultLookupTagImpl (t * testing.T ) {
910- runWhenEnterpriseOrKonnect (t , ">=2.8.0" )
911924 setup (t )
912925
913926 ctx := context .Background ()
You can’t perform that action at this time.
0 commit comments