fix: fixed fake custom entity panic issue (#178)

Kong · Jan 24, 2025 · da051e1 · da051e1
1 parent c296111
commit da051e1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/pkg/file/types.go b/pkg/file/types.go
@@ -949,7 +949,7 @@ func (f *FCustomEntity) UnmarshalJSON(b []byte) error {
 		}
 		return copyToFCustomEntity(entity, f)
 	default:
-		return fmt.Errorf("unknown entity type: %s", *f.Type)
+		return fmt.Errorf("unknown entity type: %s", temp["type"])
 	}
 }
 

diff --git a/tests/integration/sync_test.go b/tests/integration/sync_test.go
@@ -7593,7 +7593,7 @@ func Test_Sync_DegraphqlRoutes(t *testing.T) {
 		currentState, err := fetchCurrentState(ctx, client, dumpConfig)
 		require.NoError(t, err)
 
-		targetState := stateFromFile(ctx, t, "testdata/sync/036-degraphql-routes/kong.yaml", client, dumpConfig)
+		targetState := stateFromFile(ctx, t, "testdata/sync/037-degraphql-routes/kong.yaml", client, dumpConfig)
 		syncer, err := deckDiff.NewSyncer(deckDiff.SyncerOpts{
 			CurrentState: currentState,
 			TargetState:  targetState,
@@ -7625,7 +7625,7 @@ func Test_Sync_DegraphqlRoutes(t *testing.T) {
 		currentState, err := fetchCurrentState(ctx, client, dumpConfig)
 		require.NoError(t, err)
 
-		targetState := stateFromFile(ctx, t, "testdata/sync/036-degraphql-routes/kong-complex-query.yaml", client, dumpConfig)
+		targetState := stateFromFile(ctx, t, "testdata/sync/037-degraphql-routes/kong-complex-query.yaml", client, dumpConfig)
 		syncer, err := deckDiff.NewSyncer(deckDiff.SyncerOpts{
 			CurrentState: currentState,
 			TargetState:  targetState,
@@ -7654,3 +7654,11 @@ func Test_Sync_DegraphqlRoutes(t *testing.T) {
 		assert.Equal(t, expectedMethods, degraphqlRoutes[0].Methods)
 	})
 }
+
+func Test_Sync_CustomEntities_Fake(t *testing.T) {
+	runWhen(t, "enterprise", ">=3.0.0")
+	setup(t)
+	err := sync("testdata/sync/037-degraphql-routes/kong-fake-entity.yaml")
+	require.Error(t, err)
+	assert.ErrorContains(t, err, "unknown entity type: fake-entity")
+}
diff --git a/...-degraphql-routes/kong-complex-query.yaml → ...-degraphql-routes/kong-complex-query.yaml b/...-degraphql-routes/kong-complex-query.yaml → ...-degraphql-routes/kong-complex-query.yaml
diff --git a/tests/integration/testdata/sync/037-degraphql-routes/kong-fake-entity.yaml b/tests/integration/testdata/sync/037-degraphql-routes/kong-fake-entity.yaml
@@ -0,0 +1,5 @@
+_format_version: "3.0"
+custom_entities:
+- type: fake-entity
+  fields:
+    foo: bar
diff --git a/...tdata/sync/036-degraphql-routes/kong.yaml → ...tdata/sync/037-degraphql-routes/kong.yaml b/...tdata/sync/036-degraphql-routes/kong.yaml → ...tdata/sync/037-degraphql-routes/kong.yaml