feat: Kong Plugin

.github/workflows/ci.yml

@@ -31,5 +31,3 @@ jobs:
     - name: Build Docker image
       run: make docker
 
-    - name: Build plugins Docker images
-      run: make docker-plugins

.github/workflows/docker.yml

@@ -41,7 +41,7 @@ jobs:
         with:
           context: .
           tags: ghcr.io/apiclarity/apiclarity:latest
-          file: Dockerfile.kong
+          file: Dockerfile
           push: true
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -54,7 +54,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: plugins
-          tags: ghcr.io/apiclarity/kong-plugin:test
+          tags: ghcr.io/apiclarity/kong-plugin:latest
           file: plugins/Dockerfile.kong
           push: true
           cache-from: type=local,src=/tmp/.buildx-cache

.github/workflows/release.yaml

@@ -57,6 +57,7 @@ jobs:
           git commit deployment/apiclarity.yaml -m "workflow: update tag in deployment yaml"
 
           sed -i 's/image: ghcr.io\/apiclarity\/kong-plugin:latest/image: ghcr.io\/apiclarity\/kong-plugin:'"$tag"'/g' plugins/gateway/kong/deploy/deploy.sh
+          git commit plugins/gateway/kong/deploy/deploy.sh -m "workflow: update tag in kong deploy script"
 
           git tag --annotate --message "Tag for release $tag" "$tag"
           git push origin "refs/tags/$tag"
@@ -88,7 +89,7 @@ jobs:
         with:
           context: .
           tags: ghcr.io/apiclarity/apiclarity:${{ github.event.inputs.version }}
-          file: Dockerfile.kong
+          file: Dockerfile
           push: true
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache

.goreleaser.yml

@@ -27,7 +27,7 @@ archives:
       - wasm-filters/envoyFilter.yaml
       - wasm-filters/bin/release/http-trace-filter.wasm
       - deployment/apiclarity.yaml
-      - plugins/gateway/kong/deploy/deploy.sh
+      - plugins/gateway/kong/deploy/*
 
 checksum:
   name_template: 'checksums.txt'

Makefile

@@ -52,24 +52,27 @@ api: ## Generating API code
 	@(cd api; ./generate.sh)
 
 .PHONY: docker
-docker: ## Build Docker image
-	@(echo "Building docker image ..." )
+docker:	docker-backend docker-plugins
+
+.PHONY: docker-backend
+docker-backend: ## Build Docker image
+	@(echo "Building backend docker image ..." )
 	docker build --build-arg VERSION=${VERSION} \
 		--build-arg BUILD_TIMESTAMP=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ") \
 		--build-arg COMMIT_HASH=$(shell git rev-parse HEAD) \
 		-t ${DOCKER_IMAGE}:${DOCKER_TAG} .
 
-.PHONY: push-docker
-push-docker: docker ## Build and Push Docker image
-	@echo "Publishing Docker image ..."
+.PHONY: push-docker-backend
+push-docker-backend: docker-backend ## Build and Push Docker image
+	@echo "Publishing backend Docker image ..."
 	docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
 
 .PHONY: docker-plugins
 docker-plugins: ## Build plugins Docker image
 	$(MAKE) docker -C plugins
 
 .PHONY: push-docker-plugins
-push-docker-plugins: docker-plugins ## Build and Push Docker image
+push-docker-plugins: ## Build and Push plugins Docker image
 	$(MAKE) push-docker -C plugins
 
 .PHONY: test

plugins/Makefile

@@ -1,21 +1,19 @@
 # Project variables
-BINARY_NAME ?= kong-plugin
 DOCKER_REGISTRY ?= ghcr.io/apiclarity
 VERSION ?= $(shell git rev-parse HEAD)
-DOCKER_IMAGE ?= $(DOCKER_REGISTRY)/$(BINARY_NAME)
 DOCKER_TAG ?= ${VERSION}
 
 .PHONY: docker
 docker: docker-kong
 
 .PHONY: docker-kong
 docker-kong:
-	@DOCKER_BUILDKIT=1 docker build -t ${DOCKER_IMAGE}:${DOCKER_TAG} --file Dockerfile.kong .
+	@DOCKER_BUILDKIT=1 docker build -t ${DOCKER_REGISTRY}/kong-plugin:${DOCKER_TAG} --file Dockerfile.kong .
 
 .PHONY: push-docker
 push-docker: push-docker-kong
 
 .PHONY: push-docker-kong
 push-docker-kong: docker-kong
 	@echo "Publishing Kong plugin Docker image ..."
-	docker push ${DOCKER_IMAGE}:${DOCKER_TAG}
+	docker push ${DOCKER_REGISTRY}/kong-plugin:${DOCKER_TAG}

plugins/gateway/kong/README.md

@@ -6,7 +6,7 @@ run:
 
 
 ```shell
-KONG_PROXY_CONTAINER_NAME=<name> KONG_GATEWAY_DEPLOYMENT_NAME=<name> KONG_GATEWAY_INGRESS_NAME=<name> ./deploy
+KONG_PROXY_CONTAINER_NAME=<name> KONG_GATEWAY_DEPLOYMENT_NAME=<name> KONG_GATEWAY_INGRESS_NAME=<name> ./deploy/deploy.sh
 ```
 
 Where:

plugins/gateway/kong/deploy/patch-deployment.yaml

@@ -3,12 +3,12 @@ spec:
     spec:
       volumes:
       - emptyDir: {}
-        name: kong-securecn-trace-plugin
+        name: kong-apiclarity-trace-plugin
       containers:
       - name: {{KONG_PROXY_CONTAINER_NAME}}
         volumeMounts:
         - mountPath: /plugins/
-          name: kong-securecn-trace-plugin
+          name: kong-apiclarity-trace-plugin
         env:
         - name: KONG_PLUGINS
           value: kong-plugin
@@ -28,4 +28,4 @@ spec:
         name: securecn-kong-plugin-injector
         volumeMounts:
         - mountPath: /plugin
-          name: kong-securecn-trace-plugin
+          name: kong-apiclarity-trace-plugin

plugins/gateway/kong/plugin.go

@@ -46,7 +46,7 @@ func New() interface{} {
 func (conf Config) Response(kong *pdk.PDK) {
 	telemetry, err := createTelemetry(kong)
 	if err != nil {
-		_ = kong.Log.Err(fmt.Sprintf("Failed to create telemetry. %v", err))
+		_ = kong.Log.Err(fmt.Sprintf("Failed to create telemetry: %v", err))
 		return
 	}
 
@@ -67,15 +67,11 @@ func createTelemetry(kong *pdk.PDK) (*models.Telemetry, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to get client ip. %v", err)
 	}
-	//clientPort, err := kong.Client.GetPort()
-	//if err != nil {
-	//	return nil, fmt.Errorf("failed to get client port. %v", err)
-	//}
 	destPort := routedService.Port
 	host := routedService.Host
 
 	// Will get the actual path that the request was sent to, not the routed one
-	path, err := kong.Request.GetPath()
+	path, err := kong.Request.GetPathWithQuery()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get request path. %v", err)
 	}
@@ -115,18 +111,19 @@ func createTelemetry(kong *pdk.PDK) (*models.Telemetry, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to get response headers. %v", err)
 	}
+	parsedHost, namespace := parseHost(host)
 
 	telemetry := models.Telemetry{
 		DestinationAddress:   ":" + strconv.Itoa(destPort), // No destination ip for now
-		DestinationNamespace: "",
+		DestinationNamespace: namespace,
 		Request: &models.Request{
 			Common: &models.Common{
 				TruncatedBody: false,
 				Body:          strfmt.Base64(reqBody),
 				Headers:       createHeaders(reqHeaders),
 				Version:       fmt.Sprintf("%f", version),
 			},
-			Host:   parseHost(host),
+			Host:   parsedHost,
 			Method: method,
 			Path:   path,
 		},
@@ -147,15 +144,19 @@ func createTelemetry(kong *pdk.PDK) (*models.Telemetry, error) {
 	return &telemetry, nil
 }
 
-func parseHost(kongHost string) string {
+// KongHost: <namespace>.<svc-name>.svc.cluster.local.80
+// convert to namespace.name
+func parseHost(kongHost string) (host, namespace string) {
 	sp := strings.Split(kongHost, ".")
 
 	// nolint:gomnd
 	if len(sp) < 2 {
-		return kongHost
+		return kongHost, ""
 	}
+	host = sp[0] + "." + sp[1]
+	namespace = sp[0]
 
-	return sp[0] + "." + sp[1]
+	return
 }
 
 func createHeaders(headers map[string][]string) []*models.Header {