Merge branch 'main' into feat/consumer-groups

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Table of Contents
 
+- [v0.45.0](#v0450)
 - [v0.44.0](#v0440)
 - [v0.43.0](#v0430)
 - [v0.42.0](#v0420)
@@ -58,6 +59,15 @@
 
 ## Unreleased
 
+> Release date: TBD
+
+## [v0.45.0]
+
+> Release date: 2023/07/03
+
+- Added `Client.Config` handler, that can be used to obtain Kong's config.
+  [#354](https://github.com/Kong/go-kong/pull/354)
+
 ## [v0.44.0]
 
 > Release date: 2023/06/22
@@ -789,6 +799,7 @@ authentication credentials in Kong.
   releases of Kong since every release of Kong is introducing breaking changes
   to the Admin API.
 
+[v0.45.0]: https://github.com/Kong/go-kong/compare/v0.44.0...v0.45.0
 [v0.44.0]: https://github.com/Kong/go-kong/compare/v0.43.0...v0.44.0
 [v0.43.0]: https://github.com/Kong/go-kong/compare/v0.42.0...v0.43.0
 [v0.42.0]: https://github.com/Kong/go-kong/compare/v0.41.0...v0.42.0

kong/certificate_service.go

@@ -78,7 +78,7 @@ func (s *CertificateService) Update(ctx context.Context,
 	certificate *Certificate,
 ) (*Certificate, error) {
 	if isEmptyString(certificate.ID) {
-		return nil, fmt.Errorf("ID cannot be nil for Update op           eration")
+		return nil, fmt.Errorf("ID cannot be nil for Update operation")
 	}
 
 	endpoint := fmt.Sprintf("/certificates/%v", *certificate.ID)

kong/client.go

@@ -3,6 +3,7 @@ package kong
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net"
@@ -357,6 +358,30 @@ func (c *Client) Status(ctx context.Context) (*Status, error) {
 	return &s, nil
 }
 
+// Config gets the specified config from the configured Admin API endpoint
+// and should contain the JSON serialized body that adheres to the configuration
+// format specified at:
+// https://docs.konghq.com/gateway/latest/production/deployment-topologies/db-less-and-declarative-config/#declarative-configuration-format
+// It returns the response body and an error, if it encounters any.
+func (c *Client) Config(ctx context.Context) ([]byte, error) {
+	req, err := c.NewRequest("GET", "/config", nil, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var configWrapper map[string]string
+	_, err = c.Do(ctx, req, &configWrapper)
+	if err != nil {
+		return nil, err
+	}
+	config, ok := configWrapper["config"]
+	if !ok {
+		return nil, errors.New("config field not found in GET /config response body")
+	}
+
+	return []byte(config), nil
+}
+
 // Root returns the response of GET request on root of Admin API (GET / or /kong with a workspace).
 func (c *Client) Root(ctx context.Context) (map[string]interface{}, error) {
 	endpoint := "/"

kong/client_test.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"gopkg.in/yaml.v2"
 )
 
 func TestNewTestClient(t *testing.T) {
@@ -32,6 +33,22 @@ func TestKongStatus(T *testing.T) {
 	assert.NotNil(status)
 }
 
+func TestKongConfig(t *testing.T) {
+	RunWhenDBMode(t, "off")
+	client, err := NewTestClient(nil, nil)
+	require.NoError(t, err)
+	require.NotNil(t, client)
+
+	config, err := client.Config(defaultCtx)
+	require.NoError(t, err)
+	require.NotNil(t, config)
+
+	var configStruct map[string]any
+	require.NoError(t, yaml.Unmarshal(config, &configStruct))
+	require.Contains(t, configStruct, "_format_version")
+	require.Contains(t, configStruct, "_transform")
+}
+
 func TestRoot(T *testing.T) {
 	assert := assert.New(T)