Add ability to set auto block and HTTP settings for proxy repos (ansi…

…ble-ThoTeam#394)
sebthauvette · Dec 16, 2023 · 186fd70 · 186fd70
1 parent 16e0f03
commit 186fd70
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1096,6 +1096,11 @@ Feel free to use them or implement your own install scenario at your convenience
     nexus_repos_npm_proxy:
       - name: npm-proxy-name
         blob_store: company-artifacts
+        blocked: false # Default is false
+        auto_block: true # Default is true
+        connection_timeout: 200 # Default is unset
+        connection_retries: 5 # Default is unset
+        user_agent_suffix: custom-agent # Default is unset
         remote_url: https://some-private-registry.dev/
         remote_username: 'secret-username'
         remote_password: "{{ vault_alfresco_secret_password }}"

diff --git a/files/groovy/create_repos_from_list.groovy b/files/groovy/create_repos_from_list.groovy
@@ -108,10 +108,13 @@ parsed_args.each { currentRepo ->
         // Configs for all proxy repos
         if (currentRepo.type == 'proxy') {
             configuration.attributes['httpclient'] = [
-                    blocked       : false,
-                    autoBlock     : true,
+                    blocked       : currentRepo.get('blocked', false),
+                    autoBlock     : currentRepo.get('auto_block', true),
                     connection    : [
                             useTrustStore: false,
+                            timeout: currentRepo.get('connection_timeout', null),
+                            retries: currentRepo.get('connection_retries', null),
+                            userAgentSuffix: currentRepo.get('user_agent_suffix', null),
                             enableCircularRedirects: currentRepo.get('enable_circular_redirects', false),
                             enableCookies: currentRepo.get('enable_cookies', false)
                     ]

diff --git a/molecule/nexus_common_test_vars.yml b/molecule/nexus_common_test_vars.yml
@@ -92,6 +92,13 @@ nexus_repos_npm_proxy:
     negative_cache_enabled: false
     enable_circular_redirects: true
     enable_cookies: true
+    connection_timeout: 300
+    connection_retries: 5
+  - name: npm-registry-blocked
+    remote_url: https://registry.npmjs.org/
+    blocked: true
+    auto_block: false
+    user_agent_suffix: custom-agent
 
 nexus_repos_yum_hosted:
   - name: private_yum_centos_7