fix(images): conform to new couchbase persistence configuration (#2188)

JanssenProject · Aug 22, 2022 · c708542 · c708542
1 parent 67b4b0e
commit c708542
Show file tree

Hide file tree

Showing 15 changed files with 152 additions and 99 deletions.
diff --git a/docker-jans-auth-server/Dockerfile b/docker-jans-auth-server/Dockerfile
@@ -56,7 +56,7 @@ RUN /opt/jython/bin/pip uninstall -y pip
 # ===========
 
 ENV CN_VERSION=1.0.2-SNAPSHOT
-ENV CN_BUILD_DATE='2022-08-03 12:37'
+ENV CN_BUILD_DATE='2022-08-18 17:16'
 ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-server/${CN_VERSION}/jans-auth-server-${CN_VERSION}.war
 
 # Install Jans Auth

diff --git a/docker-jans-auth-server/conf/jans-couchbase.properties.tmpl b/docker-jans-auth-server/conf/jans-couchbase.properties.tmpl
@@ -6,30 +6,36 @@ servers: %(hostname)s
 # Default SDK connectTimeout is 10s
 connection.connect-timeout: %(couchbase_conn_timeout)s
 
+# Enable/disable DNS SRV lookup for the bootstrap nodes
+# Default dnsSrvEnabled is true
+connection.dns.use-lookup: false
+
+# Key/value timeout
+# Default SDK kvTimeout is 2500ms
+connection.kv-timeout: 5000
+
+# Query timeout
+# Default SDK queryTimeout is 75s
+connection.query-timeout: 75000
+
+# Configures whether mutation tokens will be returned from the server for all mutation operations
+# Default mutationTokensEnabled is true
+# connection.mutation-tokens-enabled: false
+
 # At startup when connection error is occurred persistence layer can make another attempt to open buckets.
 # Before make next try it pause process for 5 second. If after that total connection time is less than specified
 # in property above new attempt will be executed
 connection.connection-max-wait-time: %(couchbase_conn_max_wait)s
-connection.operation-tracing-enabled: false
-
-# If mutation tokens are enabled, they can be used for advanced durability requirements,
-# as well as optimized RYOW consistency.
-connection.mutation-tokens-enabled: false
-
-# Sets the pool size (number of threads to use) for all non blocking operations in the core and clients
-# (default value is the number of CPUs).
-#connection.computation-pool-size: 5
 
 # Default scan consistency. Possible values are: not_bounded, request_plus, statement_plus
 connection.scan-consistency: %(couchbase_scan_consistency)s
 
-# Sets the time of inactivity, in milliseconds, after which some services
-# will issue a form of keep-alive request to their corresponding server/nodes
-# (default is 30s, values &lt;= 0 deactivate the idle check).
-connection.keep-alive-interval: %(couchbase_keepalive_interval)s
+# Disable scan consistency in queries. Default value: false
+# connection.ignore-attribute-scan-consistency: true
 
-# Customize the timeout used for keepalive operations
-connection.keep-alive-timeout: %(couchbase_keepalive_timeout)s
+# Try to execute query with scan consitency specified in connection.scan-consistency first.
+# On failure execute query again with scan consistency specified in attributes defintions. Default value: true
+# connection.attempt-without-attribute-scan-consistency: false
 
 # Enable scopes support. Default value: false
 # connection.enable-scope-support: true
@@ -50,7 +56,9 @@ password.encryption.method: %(encryption_method)s
 ssl.trustStore.enable: %(ssl_enabled)s
 ssl.trustStore.file: %(couchbaseTrustStoreFn)s
 ssl.trustStore.pin: %(encoded_couchbaseTrustStorePass)s
-ssl.trustStore.format: pkcs12
+ssl.trustStore.type: pkcs12
+
+tls.enable: false
 
 binaryAttributes=objectGUID
 certificateAttributes=userCertificate
diff --git a/docker-jans-client-api/Dockerfile b/docker-jans-client-api/Dockerfile
@@ -46,7 +46,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer//${JYTHON_VERSI
 # ==========
 
 ENV CN_VERSION=1.0.2-SNAPSHOT
-ENV CN_BUILD_DATE='2022-08-03 12:40'
+ENV CN_BUILD_DATE='2022-08-18 17:19'
 ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-client-api-server/${CN_VERSION}/jans-client-api-server-${CN_VERSION}.war
 
 COPY jetty/jetty-env.xml /tmp/WEB-INF/jetty-env.xml

diff --git a/docker-jans-client-api/conf/jans-couchbase.properties.tmpl b/docker-jans-client-api/conf/jans-couchbase.properties.tmpl
@@ -6,30 +6,36 @@ servers: %(hostname)s
 # Default SDK connectTimeout is 10s
 connection.connect-timeout: %(couchbase_conn_timeout)s
 
+# Enable/disable DNS SRV lookup for the bootstrap nodes
+# Default dnsSrvEnabled is true
+connection.dns.use-lookup: false
+
+# Key/value timeout
+# Default SDK kvTimeout is 2500ms
+connection.kv-timeout: 5000
+
+# Query timeout
+# Default SDK queryTimeout is 75s
+connection.query-timeout: 75000
+
+# Configures whether mutation tokens will be returned from the server for all mutation operations
+# Default mutationTokensEnabled is true
+# connection.mutation-tokens-enabled: false
+
 # At startup when connection error is occurred persistence layer can make another attempt to open buckets.
 # Before make next try it pause process for 5 second. If after that total connection time is less than specified
 # in property above new attempt will be executed
 connection.connection-max-wait-time: %(couchbase_conn_max_wait)s
-connection.operation-tracing-enabled: false
-
-# If mutation tokens are enabled, they can be used for advanced durability requirements,
-# as well as optimized RYOW consistency.
-connection.mutation-tokens-enabled: false
-
-# Sets the pool size (number of threads to use) for all non blocking operations in the core and clients
-# (default value is the number of CPUs).
-#connection.computation-pool-size: 5
 
 # Default scan consistency. Possible values are: not_bounded, request_plus, statement_plus
 connection.scan-consistency: %(couchbase_scan_consistency)s
 
-# Sets the time of inactivity, in milliseconds, after which some services
-# will issue a form of keep-alive request to their corresponding server/nodes
-# (default is 30s, values &lt;= 0 deactivate the idle check).
-connection.keep-alive-interval: %(couchbase_keepalive_interval)s
+# Disable scan consistency in queries. Default value: false
+# connection.ignore-attribute-scan-consistency: true
 
-# Customize the timeout used for keepalive operations
-connection.keep-alive-timeout: %(couchbase_keepalive_timeout)s
+# Try to execute query with scan consitency specified in connection.scan-consistency first.
+# On failure execute query again with scan consistency specified in attributes defintions. Default value: true
+# connection.attempt-without-attribute-scan-consistency: false
 
 # Enable scopes support. Default value: false
 # connection.enable-scope-support: true
@@ -50,7 +56,9 @@ password.encryption.method: %(encryption_method)s
 ssl.trustStore.enable: %(ssl_enabled)s
 ssl.trustStore.file: %(couchbaseTrustStoreFn)s
 ssl.trustStore.pin: %(encoded_couchbaseTrustStorePass)s
-ssl.trustStore.format: pkcs12
+ssl.trustStore.type: pkcs12
+
+tls.enable: false
 
 binaryAttributes=objectGUID
 certificateAttributes=userCertificate
diff --git a/docker-jans-config-api/Dockerfile b/docker-jans-config-api/Dockerfile
@@ -32,7 +32,7 @@ RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${JETTY_
 # ==========
 
 ENV CN_VERSION=1.0.2-SNAPSHOT
-ENV CN_BUILD_DATE='2022-08-11 14:58'
+ENV CN_BUILD_DATE='2022-08-18 18:11'
 ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api-server/${CN_VERSION}/jans-config-api-server-${CN_VERSION}.war
 
 # Install Jans Config API

diff --git a/docker-jans-config-api/conf/jans-couchbase.properties.tmpl b/docker-jans-config-api/conf/jans-couchbase.properties.tmpl
@@ -6,30 +6,36 @@ servers: %(hostname)s
 # Default SDK connectTimeout is 10s
 connection.connect-timeout: %(couchbase_conn_timeout)s
 
+# Enable/disable DNS SRV lookup for the bootstrap nodes
+# Default dnsSrvEnabled is true
+connection.dns.use-lookup: false
+
+# Key/value timeout
+# Default SDK kvTimeout is 2500ms
+connection.kv-timeout: 5000
+
+# Query timeout
+# Default SDK queryTimeout is 75s
+connection.query-timeout: 75000
+
+# Configures whether mutation tokens will be returned from the server for all mutation operations
+# Default mutationTokensEnabled is true
+# connection.mutation-tokens-enabled: false
+
 # At startup when connection error is occurred persistence layer can make another attempt to open buckets.
 # Before make next try it pause process for 5 second. If after that total connection time is less than specified
 # in property above new attempt will be executed
 connection.connection-max-wait-time: %(couchbase_conn_max_wait)s
-connection.operation-tracing-enabled: false
-
-# If mutation tokens are enabled, they can be used for advanced durability requirements,
-# as well as optimized RYOW consistency.
-connection.mutation-tokens-enabled: false
-
-# Sets the pool size (number of threads to use) for all non blocking operations in the core and clients
-# (default value is the number of CPUs).
-#connection.computation-pool-size: 5
 
 # Default scan consistency. Possible values are: not_bounded, request_plus, statement_plus
 connection.scan-consistency: %(couchbase_scan_consistency)s
 
-# Sets the time of inactivity, in milliseconds, after which some services
-# will issue a form of keep-alive request to their corresponding server/nodes
-# (default is 30s, values &lt;= 0 deactivate the idle check).
-connection.keep-alive-interval: %(couchbase_keepalive_interval)s
+# Disable scan consistency in queries. Default value: false
+# connection.ignore-attribute-scan-consistency: true
 
-# Customize the timeout used for keepalive operations
-connection.keep-alive-timeout: %(couchbase_keepalive_timeout)s
+# Try to execute query with scan consitency specified in connection.scan-consistency first.
+# On failure execute query again with scan consistency specified in attributes defintions. Default value: true
+# connection.attempt-without-attribute-scan-consistency: false
 
 # Enable scopes support. Default value: false
 # connection.enable-scope-support: true
@@ -50,7 +56,9 @@ password.encryption.method: %(encryption_method)s
 ssl.trustStore.enable: %(ssl_enabled)s
 ssl.trustStore.file: %(couchbaseTrustStoreFn)s
 ssl.trustStore.pin: %(encoded_couchbaseTrustStorePass)s
-ssl.trustStore.format: pkcs12
+ssl.trustStore.type: pkcs12
+
+tls.enable: false
 
 binaryAttributes=objectGUID
 certificateAttributes=userCertificate
diff --git a/docker-jans-fido2/Dockerfile b/docker-jans-fido2/Dockerfile
@@ -35,7 +35,7 @@ EXPOSE 8080
 # =====
 
 ENV CN_VERSION=1.0.2-SNAPSHOT
-ENV CN_BUILD_DATE='2022-08-03 12:37'
+ENV CN_BUILD_DATE='2022-08-18 17:17'
 ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-fido2-server/${CN_VERSION}/jans-fido2-server-${CN_VERSION}.war
 
 # Install FIDO2

diff --git a/docker-jans-fido2/conf/jans-couchbase.properties.tmpl b/docker-jans-fido2/conf/jans-couchbase.properties.tmpl
@@ -6,30 +6,36 @@ servers: %(hostname)s
 # Default SDK connectTimeout is 10s
 connection.connect-timeout: %(couchbase_conn_timeout)s
 
+# Enable/disable DNS SRV lookup for the bootstrap nodes
+# Default dnsSrvEnabled is true
+connection.dns.use-lookup: false
+
+# Key/value timeout
+# Default SDK kvTimeout is 2500ms
+connection.kv-timeout: 5000
+
+# Query timeout
+# Default SDK queryTimeout is 75s
+connection.query-timeout: 75000
+
+# Configures whether mutation tokens will be returned from the server for all mutation operations
+# Default mutationTokensEnabled is true
+# connection.mutation-tokens-enabled: false
+
 # At startup when connection error is occurred persistence layer can make another attempt to open buckets.
 # Before make next try it pause process for 5 second. If after that total connection time is less than specified
 # in property above new attempt will be executed
 connection.connection-max-wait-time: %(couchbase_conn_max_wait)s
-connection.operation-tracing-enabled: false
-
-# If mutation tokens are enabled, they can be used for advanced durability requirements,
-# as well as optimized RYOW consistency.
-connection.mutation-tokens-enabled: false
-
-# Sets the pool size (number of threads to use) for all non blocking operations in the core and clients
-# (default value is the number of CPUs).
-#connection.computation-pool-size: 5
 
 # Default scan consistency. Possible values are: not_bounded, request_plus, statement_plus
 connection.scan-consistency: %(couchbase_scan_consistency)s
 
-# Sets the time of inactivity, in milliseconds, after which some services
-# will issue a form of keep-alive request to their corresponding server/nodes
-# (default is 30s, values &lt;= 0 deactivate the idle check).
-connection.keep-alive-interval: %(couchbase_keepalive_interval)s
+# Disable scan consistency in queries. Default value: false
+# connection.ignore-attribute-scan-consistency: true
 
-# Customize the timeout used for keepalive operations
-connection.keep-alive-timeout: %(couchbase_keepalive_timeout)s
+# Try to execute query with scan consitency specified in connection.scan-consistency first.
+# On failure execute query again with scan consistency specified in attributes defintions. Default value: true
+# connection.attempt-without-attribute-scan-consistency: false
 
 # Enable scopes support. Default value: false
 # connection.enable-scope-support: true
@@ -50,7 +56,9 @@ password.encryption.method: %(encryption_method)s
 ssl.trustStore.enable: %(ssl_enabled)s
 ssl.trustStore.file: %(couchbaseTrustStoreFn)s
 ssl.trustStore.pin: %(encoded_couchbaseTrustStorePass)s
-ssl.trustStore.format: pkcs12
+ssl.trustStore.type: pkcs12
+
+tls.enable: false
 
 binaryAttributes=objectGUID
 certificateAttributes=userCertificate
diff --git a/docker-jans-scim/Dockerfile b/docker-jans-scim/Dockerfile
@@ -46,7 +46,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO
 # ====
 
 ENV CN_VERSION=1.0.2-SNAPSHOT
-ENV CN_BUILD_DATE='2022-08-04 15:32'
+ENV CN_BUILD_DATE='2022-08-18 18:09'
 ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-scim-server/${CN_VERSION}/jans-scim-server-${CN_VERSION}.war
 
 # Install SCIM

diff --git a/docker-jans-scim/conf/jans-couchbase.properties.tmpl b/docker-jans-scim/conf/jans-couchbase.properties.tmpl
@@ -6,30 +6,36 @@ servers: %(hostname)s
 # Default SDK connectTimeout is 10s
 connection.connect-timeout: %(couchbase_conn_timeout)s
 
+# Enable/disable DNS SRV lookup for the bootstrap nodes
+# Default dnsSrvEnabled is true
+connection.dns.use-lookup: false
+
+# Key/value timeout
+# Default SDK kvTimeout is 2500ms
+connection.kv-timeout: 5000
+
+# Query timeout
+# Default SDK queryTimeout is 75s
+connection.query-timeout: 75000
+
+# Configures whether mutation tokens will be returned from the server for all mutation operations
+# Default mutationTokensEnabled is true
+# connection.mutation-tokens-enabled: false
+
 # At startup when connection error is occurred persistence layer can make another attempt to open buckets.
 # Before make next try it pause process for 5 second. If after that total connection time is less than specified
 # in property above new attempt will be executed
 connection.connection-max-wait-time: %(couchbase_conn_max_wait)s
-connection.operation-tracing-enabled: false
-
-# If mutation tokens are enabled, they can be used for advanced durability requirements,
-# as well as optimized RYOW consistency.
-connection.mutation-tokens-enabled: false
-
-# Sets the pool size (number of threads to use) for all non blocking operations in the core and clients
-# (default value is the number of CPUs).
-#connection.computation-pool-size: 5
 
 # Default scan consistency. Possible values are: not_bounded, request_plus, statement_plus
 connection.scan-consistency: %(couchbase_scan_consistency)s
 
-# Sets the time of inactivity, in milliseconds, after which some services
-# will issue a form of keep-alive request to their corresponding server/nodes
-# (default is 30s, values &lt;= 0 deactivate the idle check).
-connection.keep-alive-interval: %(couchbase_keepalive_interval)s
+# Disable scan consistency in queries. Default value: false
+# connection.ignore-attribute-scan-consistency: true
 
-# Customize the timeout used for keepalive operations
-connection.keep-alive-timeout: %(couchbase_keepalive_timeout)s
+# Try to execute query with scan consitency specified in connection.scan-consistency first.
+# On failure execute query again with scan consistency specified in attributes defintions. Default value: true
+# connection.attempt-without-attribute-scan-consistency: false
 
 # Enable scopes support. Default value: false
 # connection.enable-scope-support: true
@@ -50,7 +56,9 @@ password.encryption.method: %(encryption_method)s
 ssl.trustStore.enable: %(ssl_enabled)s
 ssl.trustStore.file: %(couchbaseTrustStoreFn)s
 ssl.trustStore.pin: %(encoded_couchbaseTrustStorePass)s
-ssl.trustStore.format: pkcs12
+ssl.trustStore.type: pkcs12
+
+tls.enable: false
 
 binaryAttributes=objectGUID
 certificateAttributes=userCertificate
diff --git a/jans-pycloudlib/Makefile b/jans-pycloudlib/Makefile
@@ -0,0 +1,18 @@
+.PHONY: test clean all develop install uninstall
+
+.DEFAULT_GOAL := develop
+
+develop:
+	pip install -r requirements-dev.txt
+
+install:
+	pip install .
+
+uninstall:
+	pip uninstall -y jans-pycloudlib
+
+serve-docs:
+	mkdocs serve -w jans
+
+build-docs:
+	mkdocs build
diff --git a/jans-pycloudlib/README.md b/jans-pycloudlib/README.md
@@ -31,12 +31,12 @@ We are adding more typehints into the `jans.pycloudlib` sourcecode, gradually.
 
 ### Building internal docs
 
-Internal docs are generated from sphinx-based docs at `docs` directory.
+Internal docs are generated from mkdocs-based docs at `docs` directory.
 To generate/preview docs, run the following steps:
 
 1. Run `pip install -r requirements-dev.txt` to install required libraries.
 1. Preview docs by running `mkdocs serve -w jans`
-1. Visit http://localhost:8000 to see the generated docs (they are reloaded automatically when sourcecode is modified)
+1. Visit http://localhost:8000 to see the generated docs (they are reloaded automatically when source code is modified)
 
 ## Refs