Rewrite annotation value now correct when base path is set and trim p…

…refix isnt (#204)

* Fix issue where rewrite annotation wasn't received basePath when trim prefix wasn't defined - added regression test

generators/nginx_ingress/nginx_ingress.go

@@ -140,16 +140,22 @@ func (g *Generator) Generate(opts *options.Options, spec *openapi3.T) (string, e
 				pathField = opts.Path.Base + string(openApiPathVariableRegex.ReplaceAll([]byte(path), []byte("([A-z0-9]+)")))
 
 				// get the first capture group of regex. Given a path /books/{id}, will return /books/
-				rewrite := string(openApiPathVariableRegex.ReplaceAllLiteral([]byte(path), []byte("$1")))
+				rewrite := opts.Path.Base + string(openApiPathVariableRegex.ReplaceAllLiteral([]byte(path), []byte("$1")))
 				annotations[rewriteTargetAnnotationKey] = rewrite
 				annotations[useRegexAnnotationKey] = "true"
 			} else if path == "/" {
 				pathField = opts.Path.Base + "$"
-				annotations[rewriteTargetAnnotationKey] = "/"
+				annotations[rewriteTargetAnnotationKey] = opts.Path.Base + "/"
 				annotations[useRegexAnnotationKey] = "true"
 			} else {
 				pathField = opts.Path.Base + path
-				annotations[rewriteTargetAnnotationKey] = path
+				annotations[rewriteTargetAnnotationKey] = strings.TrimPrefix(pathField, opts.Path.TrimPrefix)
+			}
+
+			if rewriteValue, ok := annotations[rewriteTargetAnnotationKey]; ok {
+				rewriteValue = strings.ReplaceAll(rewriteValue, "//", "/")
+				rewriteValue = strings.TrimPrefix(rewriteValue, opts.Path.TrimPrefix)
+				annotations[rewriteTargetAnnotationKey] = rewriteValue
 			}
 
 			// Replace // with /

generators/nginx_ingress/nginx_ingress_test.go

@@ -654,6 +654,67 @@ spec:
         pathType: Exact
 status:
   loadBalancer: {}
+`,
+		},
+		{
+			name: "REGRESSION - rewrite target correct when base path defined and trim prefix is not defined",
+			options: options.Options{
+				Namespace: "default",
+				Service: options.ServiceOptions{
+					Namespace: "default",
+					Name:      "petstore",
+				},
+				Path: options.PathOptions{
+					Base: "/api",
+				},
+				PathSubOptions: map[string]options.SubOptions{
+					"/": {
+						Disabled: &trueValue,
+					},
+				},
+			},
+			spec: `
+openapi: 3.0.2
+info:
+  title: Swagger Petstore - OpenAPI 3.0
+  version: 1.0.5
+x-kusk:
+  service:
+    name: petstore
+    namespace: default
+  path:
+    base: /api
+paths:
+  /:
+    x-kusk:
+      disabled: true
+    get: {}
+  /path:
+    get: {}
+`,
+			res: `---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /api/path
+  creationTimestamp: null
+  name: petstore-path
+  namespace: default
+spec:
+  ingressClassName: nginx
+  rules:
+  - http:
+      paths:
+      - backend:
+          service:
+            name: petstore
+            port:
+              number: 80
+        path: /api/path
+        pathType: Exact
+status:
+  loadBalancer: {}
 `,
 		},
 	}