Copied relevant gateway-config changes from fork into main repo

Author: Chris Wiechmann

Diff for: gateway-config/APIGateway_7.7.20210330-DockerScripts-2.2.0-2.tar.gz

@@ -32,7 +32,7 @@
       "id": "user-6",
       "name": "achoudhary",
       "roles": ["role-1", "role-6", "role-7"]
-    },
+    }, 
     {
       "id": "user-7",
       "name": "anujkumar",
@@ -78,7 +78,13 @@
       "id": "role-7",
       "name": "Policy Developer",
       "displayName": "Policy Developer"
+    },
+    {
+      "id": "role-8",
+      "name": "Monitoring",
+      "displayName": "Monitoring"
     }
+    
   ],
   "uniqueIdCounters": {
     "Role": 8,

Diff for: gateway-config/anm/merge-dir/apigateway/conf/acl.json

@@ -0,0 +1,50 @@
+# This file is read when the server starts up. If a server configuration contains a value in the format
+# ${env.X}, where X is any string (for example, MyCustomSetting), this file MUST contain an equivalent
+# name-value pair of env.MyCustomSetting=MyCustomValue. 
+# When the server starts up, every occurrence of env.MyCustomSetting is expanded to the value of MyCustomValue.
+# For example, by default the port in the server configuration is set to ${env.PORT.TRAFFIC}, specifying a name-value
+# pair of env.PORT.TRAFFIC=8080 results in the server opening up port 8080 at start up.
+
+# An example of how you might bind a reference to a host-specific certificate to a given deployment. The
+# SSL X509 Certificate in the 'SSL Interface' configuration item can then reference it using the binding
+# variable '${env.serverCertificate}'
+#env.serverCertificate=${system.prefix.cert}CN=MYHOST
+
+# the default port which the Instance listens on for HTTP traffic
+env.PORT.TRAFFIC=8080
+
+# the default port which the Instance listens on for management/configuration HTTP traffic
+env.PORT.MANAGEMENT=8085
+
+# the default port which the Instance listens on for sample messages
+env.PORT.SAMPLE.SERVICES=8081
+
+# the hostname of the OAuth Server defaults to localhost
+env.OAUTH.SERVER=localhost
+
+# the default port which OAuth 2.0 Services listen on for traffic
+env.PORT.OAUTH2.SERVICES=8089
+
+# the hostname of the OAuth Client defaults to localhost
+env.OAUTH.CLIENT=localhost
+
+# the default port which OAuth 2.0 Client Services listen on for traffic
+env.PORT.OAUTH2.CLIENT=8088
+
+# the default AMA broker port
+env.BROKER.PORT=61616
+
+# API Portal Port
+env.PORT.APIPORTAL=8075
+
+# API Portal Traffic Port
+env.PORT.PORTAL.TRAFFIC=8065
+
+# Content Security Policy Header value for API Portal and Client Application Registry
+env.SERVICES.CONTENTSECURITYPOLICY=script-src 'self' https://axway.com/ https://*.axway.com 'unsafe-eval'; img-src 'self' https://*.axway.com data: blob:; style-src 'self' 'unsafe-inline' https://*.axway.com; font-src 'self' data: blob:; object-src 'self'; media-src 'self'; frame-src 'self';frame-ancestors 'none'; upgrade-insecure-requests
+
+# Content Security Policy Header value for Anlaytics
+env.ANALYTICS.CONTENTSECURITYPOLICY=script-src 'self' https://axway.com/ https://*.axway.com 'unsafe-eval'; img-src 'self' https://*.axway.com data: blob:; style-src 'self' 'unsafe-inline' https://*.axway.com; font-src 'self' data: blob:; object-src 'self'; media-src 'self'; frame-src 'self';frame-ancestors 'none'; upgrade-insecure-requests
+
+env.SMTP.USERNAME=AKIAVAFE2RS247WDMVWK
+env.SMTP.PASSWORD=BEGvZKXLVa0TLMRDZZ3knK86mkrXI+g3R+r/aMMZDRjy

Diff for: gateway-config/anm/merge-dir/apigateway/conf/adminUsers.json

@@ -7,6 +7,8 @@ if [ "$APIGATEWAY_HOME" == "" -o "$API_TRAFFIC_URL" == "" ]; then
     echo "Missing APIGATEWAY_HOME. For example please call: ./scripts/callAPIs.sh \"/opt/Axway/apigateway\" \"https://traffic.axway-amplify-central.com\""
     echo "Or as a background process"
     echo "nohup ./callAPIs.sh /opt/Axway/apigateway https://traffic.axway-amplify-central.com >/dev/null 2>&1 &"
+    echo "Or"
+    echo "nohup ./callAPIs.sh /opt/Axway/apigateway https://traffic.axway-apim-on-eks.de >/dev/null 2>&1 &"
     exit
 fi
 

Diff for: gateway-config/apigw-emt-scripts-2.4.0-20220222.150412-10.tar.gz

@@ -211,6 +211,26 @@ dojoConfig.app = {
                     {value: false, label: 'False'}
                 ]
             },
+            ODataApi: {
+                label: 'OData API',
+                required: false,
+                help: "Set to true, if this API is an OData API",
+                type: "switch",
+                options: [
+                    {value: true, label: 'True'},
+                    {value: false, label: 'False'}
+                ]
+            },
+            validateRequest: {
+                label: 'Validate request',
+                required: false,
+                help: "If true, the request will be checked against OpenAPI Schema definition.",
+                type: "switch",
+                options: [
+                    {value: true, label: 'True'},
+                    {value: false, label: 'False'}
+                ]
+            },
             securityLevel: {
                 label: 'Security level',
                 required: true,