Update APIs in integration tests

wso2 · Sep 19, 2024 · 2197922 · 2197922
1 parent 73c9cbc
commit 2197922
Show file tree

Hide file tree

Showing 34 changed files with 1,163 additions and 1,163 deletions.
diff --git a/test/integration/integration/tests/resources/base/manifests.yaml b/test/integration/integration/tests/resources/base/manifests.yaml
@@ -50,20 +50,20 @@ spec:
         app: infra-backend-v1
     spec:
       containers:
-      - name: infra-backend-v1
-        image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        resources:
-          requests:
-            cpu: 10m
+        - name: infra-backend-v1
+          image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          resources:
+            requests:
+              cpu: 10m
 ---
 apiVersion: v1
 kind: Service
@@ -96,20 +96,20 @@ spec:
         app: gql-backend-v1
     spec:
       containers:
-      - name: gql-backend-v1
-        image: tharsanan/gq:1.0.0
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        resources:
-          requests:
-            cpu: 10m
+        - name: gql-backend-v1
+          image: tharsanan/gq:1.0.0
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          resources:
+            requests:
+              cpu: 10m
 ---
 apiVersion: v1
 kind: Service
@@ -142,20 +142,20 @@ spec:
         app: infra-backend-v2
     spec:
       containers:
-      - name: infra-backend-v2
-        image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e
-        env:
-        - name: POD_NAME
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.name
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        resources:
-          requests:
-            cpu: "10m"
+        - name: infra-backend-v2
+          image: gcr.io/k8s-staging-ingressconformance/echoserver:v20221109-7ee2f3e
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          resources:
+            requests:
+              cpu: "10m"
 # TODO (Amila): Uncomment once AKS test runner is enabled
 # ---
 # apiVersion: v1
@@ -409,11 +409,11 @@ spec:
   targetRef:
     group: gateway.networking.k8s.io
     kind: Gateway
-    name: wso2-apk-default   
+    name: wso2-apk-default
 ---
-# This is a API with wrong organization(jwt issuer not set). 
+# This is a API with wrong organization(jwt issuer not set).
 # When test cases apply the correct API it should overrite the wrong value to correct value
-apiVersion: dp.wso2.com/v1alpha2
+apiVersion: dp.wso2.com/v1alpha3
 kind: API
 metadata:
   name: all-http-methods-for-wildcard
@@ -427,5 +427,5 @@ spec:
   #definitionFileRef: definition-file
   production:
     - routeRefs:
-      - all-http-methods-for-wildcard-httproute
+        - all-http-methods-for-wildcard-httproute
   organization: wso2-org1111
diff --git a/test/integration/integration/tests/resources/tests/all-http-methods-for-wildcard.yaml b/test/integration/integration/tests/resources/tests/all-http-methods-for-wildcard.yaml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-apiVersion: dp.wso2.com/v1alpha2
+apiVersion: dp.wso2.com/v1alpha3
 kind: API
 metadata:
   name: all-http-methods-for-wildcard
@@ -28,7 +28,7 @@ spec:
   #definitionFileRef: definition-file
   production:
     - routeRefs:
-      - all-http-methods-for-wildcard-httproute
+        - all-http-methods-for-wildcard-httproute
   organization: wso2-org
 ---
 apiVersion: gateway.networking.k8s.io/v1beta1
@@ -38,22 +38,22 @@ metadata:
   namespace: gateway-integration-test-infra
 spec:
   parentRefs:
-  - group: gateway.networking.k8s.io
-    kind: Gateway
-    name: wso2-apk-default
-    namespace: apk-integration-test
-    sectionName: httpslistener
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: wso2-apk-default
+      namespace: apk-integration-test
+      sectionName: httpslistener
   hostnames:
-  - all-http-methods-for-wildcard.test.gw.wso2.com
+    - all-http-methods-for-wildcard.test.gw.wso2.com
   rules:
-  - matches:
-    - path:
-        type: PathPrefix
-        value: /v2/echo-full
-    backendRefs:
-    - group: dp.wso2.com
-      kind: Backend
-      name: infra-backend-v1
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /v2/echo-full
+      backendRefs:
+        - group: dp.wso2.com
+          kind: Backend
+          name: infra-backend-v1
 ---
 apiVersion: dp.wso2.com/v1alpha2
 kind: Backend
@@ -62,5 +62,5 @@ metadata:
   namespace: gateway-integration-test-infra
 spec:
   services:
-  - host: infra-backend-v1.gateway-integration-test-infra
-    port: 8080
+    - host: infra-backend-v1.gateway-integration-test-infra
+      port: 8080
diff --git a/test/integration/integration/tests/resources/tests/api-different-listener.yaml b/test/integration/integration/tests/resources/tests/api-different-listener.yaml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-apiVersion: dp.wso2.com/v1alpha2
+apiVersion: dp.wso2.com/v1alpha3
 kind: API
 metadata:
   name: test-api-with-different-listener
@@ -27,7 +27,7 @@ spec:
   #definitionFileRef: definition-file
   production:
     - routeRefs:
-      - test-api-with-different-listener-httproute
+        - test-api-with-different-listener-httproute
   organization: wso2-org
 ---
 apiVersion: gateway.networking.k8s.io/v1beta1
@@ -37,29 +37,29 @@ metadata:
   namespace: gateway-integration-test-infra
 spec:
   parentRefs:
-  - group: gateway.networking.k8s.io
-    kind: Gateway
-    name: wso2-apk-default
-    namespace: apk-integration-test
-    sectionName: httpslistener
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: wso2-apk-default
+      namespace: apk-integration-test
+      sectionName: httpslistener
   hostnames:
-  - api.am.wso2.com
+    - api.am.wso2.com
   rules:
-  - matches:
-    - path:
-        type: RegularExpression
-        value: /user/([^/]+)/playlist/([^/]+)
-      method: GET
-    filters:
-    - type: URLRewrite
-      urlRewrite:
-        path:
-          type: ReplaceFullPath
-          replaceFullPath: /user/\1/playlist/\2
-    backendRefs:
-    - group: dp.wso2.com
-      kind: Backend
-      name: infra-backend-v1
+    - matches:
+        - path:
+            type: RegularExpression
+            value: /user/([^/]+)/playlist/([^/]+)
+          method: GET
+      filters:
+        - type: URLRewrite
+          urlRewrite:
+            path:
+              type: ReplaceFullPath
+              replaceFullPath: /user/\1/playlist/\2
+      backendRefs:
+        - group: dp.wso2.com
+          kind: Backend
+          name: infra-backend-v1
 ---
 apiVersion: dp.wso2.com/v1alpha2
 kind: Backend
@@ -68,5 +68,5 @@ metadata:
   namespace: gateway-integration-test-infra
 spec:
   services:
-  - host: infra-backend-v1.gateway-integration-test-infra
-    port: 8080
+    - host: infra-backend-v1.gateway-integration-test-infra
+      port: 8080
diff --git a/test/integration/integration/tests/resources/tests/api-policy-with-jwt-generator.yaml b/test/integration/integration/tests/resources/tests/api-policy-with-jwt-generator.yaml
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-apiVersion: dp.wso2.com/v1alpha2
+apiVersion: dp.wso2.com/v1alpha3
 kind: API
 metadata:
   name: api-policy-with-jwt-generator
@@ -28,7 +28,7 @@ spec:
   #definitionFileRef: definition-file
   production:
     - routeRefs:
-      - api-policy-with-jwt-generator-httproute
+        - api-policy-with-jwt-generator-httproute
   organization: wso2-org
 ---
 apiVersion: gateway.networking.k8s.io/v1beta1
@@ -38,22 +38,22 @@ metadata:
   namespace: gateway-integration-test-infra
 spec:
   parentRefs:
-  - group: gateway.networking.k8s.io
-    kind: Gateway
-    name: wso2-apk-default
-    namespace: apk-integration-test
-    sectionName: httpslistener
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: wso2-apk-default
+      namespace: apk-integration-test
+      sectionName: httpslistener
   hostnames:
-  - api-policy-with-jwt-generator.test.gw.wso2.com
+    - api-policy-with-jwt-generator.test.gw.wso2.com
   rules:
-  - matches:
-    - path:
-        type: PathPrefix
-        value: /v2/echo-full
-    backendRefs:
-    - group: dp.wso2.com
-      kind: Backend
-      name: infra-backend-v1
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /v2/echo-full
+      backendRefs:
+        - group: dp.wso2.com
+          kind: Backend
+          name: infra-backend-v1
 ---
 apiVersion: dp.wso2.com/v1alpha3
 kind: APIPolicy
@@ -67,7 +67,7 @@ spec:
   targetRef:
     group: gateway.networking.k8s.io
     kind: API
-    name:  api-policy-with-jwt-generator
+    name: api-policy-with-jwt-generator
 ---
 apiVersion: dp.wso2.com/v1alpha1
 kind: BackendJWT
@@ -86,5 +86,5 @@ metadata:
   namespace: gateway-integration-test-infra
 spec:
   services:
-  - host: infra-backend-v1.gateway-integration-test-infra
-    port: 8080
+    - host: infra-backend-v1.gateway-integration-test-infra
+      port: 8080
diff --git a/test/integration/integration/tests/resources/tests/api-with-backend-base-path.yaml b/test/integration/integration/tests/resources/tests/api-with-backend-base-path.yaml
@@ -22,10 +22,10 @@ metadata:
 spec:
   basePath: /backend-base-path
   services:
-  - host: infra-backend-v1.gateway-integration-test-infra
-    port: 8080
+    - host: infra-backend-v1.gateway-integration-test-infra
+      port: 8080
 ---
-apiVersion: dp.wso2.com/v1alpha2
+apiVersion: dp.wso2.com/v1alpha3
 kind: API
 metadata:
   name: test-api-with-backend-base-path
@@ -39,7 +39,7 @@ spec:
   #definitionFileRef: swagger-definition-webhook
   production:
     - routeRefs:
-      - test-api-with-backend-base-path-httproute
+        - test-api-with-backend-base-path-httproute
   organization: wso2-org
 ---
 apiVersion: gateway.networking.k8s.io/v1beta1
@@ -49,20 +49,20 @@ metadata:
   namespace: gateway-integration-test-infra
 spec:
   parentRefs:
-  - group: gateway.networking.k8s.io
-    kind: Gateway
-    name: wso2-apk-default
-    namespace: apk-integration-test
-    sectionName: httpslistener
+    - group: gateway.networking.k8s.io
+      kind: Gateway
+      name: wso2-apk-default
+      namespace: apk-integration-test
+      sectionName: httpslistener
   hostnames:
-  - backend-base-path.test.gw.wso2.com
+    - backend-base-path.test.gw.wso2.com
   rules:
-  - matches:
-    - path:
-        type: PathPrefix
-        value: /
-      method: GET
-    backendRefs:
-    - group: dp.wso2.com
-      kind: Backend
-      name: infra-backend-basepath
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /
+          method: GET
+      backendRefs:
+        - group: dp.wso2.com
+          kind: Backend
+          name: infra-backend-basepath