Merge remote-tracking branch 'origin/master' into users/amaverma/UpdateIstioPolicies

charts/osdu-common/templates/appgw-ingress.yaml

@@ -82,3 +82,7 @@ spec:
           - backend:
               serviceName: wellbore-dms
               servicePort: 80
+          - backend:
+              serviceName: notification
+              servicePort: 80
+            path: /api/notification/v1/*

charts/osdu-istio-auth/templates/indexer-service.yaml

@@ -34,5 +34,8 @@ spec:
                        "*/actuator/health",
                        "/api/indexer/v2/swagger-resources/*",
                        "/api/indexer/v2/webjars/*",
+                       "*/index-worker",
+                       "*/_dps/task-handlers",
+                       "/api/indexer/v2/_dps/task-handlers/*",
                        "*/reindex",
                        "*/configuration/security"]

charts/osdu-istio-auth/templates/register.yaml

-#  Copyright © Microsoft Corporation
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-apiVersion: security.istio.io/v1beta1
-kind: AuthorizationPolicy
-metadata:
-  name: register-jwt-authz
-  namespace: osdu
-spec:
-  selector:
-    matchLabels:
-      app: register
-  action: DENY
-  rules:
-    - from:
-        - source:
-            notRequestPrincipals: ["*"]
-      to:
-        - operation:
-            notPaths: ["/",
-                       "*/swagger","*/swagger-resources","*/swagger-ui.html",
-                       "*/actuator/health",
-                       "/api/register/v1/swagger-resources/*"]

infra/templates/osdu-r3-mvp/data_partition/terraform.tfvars

@@ -148,6 +148,11 @@ cosmos_sql_collections = [
     name               = "FileLocationEntity"
     database_name      = "osdu-db"
     partition_key_path = "/id"
+  },
+  {
+    name               = "WorkflowCustomOperatorInfo"
+    database_name      = "osdu-db"
+    partition_key_path = "/operatorId"
   }
 ]
 

infra/templates/osdu-r3-mvp/data_partition/tests/unit/unit_test.go

@@ -49,7 +49,7 @@ func TestTemplate(t *testing.T) {
 		TfOptions:                       tfOptions,
 		Workspace:                       workspace,
 		PlanAssertions:                  nil,
-		ExpectedResourceCount:           90,
+		ExpectedResourceCount:           91,
 		ExpectedResourceAttributeValues: resourceDescription,
 	}