From cb7460f38cb4fbd879f373e7c54b432f97b0ceff Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Fri, 18 Aug 2023 18:27:40 -0400
Subject: [PATCH] Bump vmpooler gem and make auth optional

---
 docker/Gemfile                                |  4 +-
 docker/Gemfile.lock                           | 58 ++++++++++---------
 .../configmap-vmpooler-baseconfig.yaml        |  2 +
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/docker/Gemfile b/docker/Gemfile
index cd67ec9..277da09 100644
--- a/docker/Gemfile
+++ b/docker/Gemfile
@@ -1,6 +1,6 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-gem 'vmpooler',                    '~> 3.0'
+# gem 'vmpooler',                    '~> 3.0'
 gem 'vmpooler-dns-gcp',            '~> 1.0'
 # Remove temporarily until a stable minor release is published
 # gem 'vmpooler-provider-ec2',       '~> 0.0.1'
@@ -8,7 +8,7 @@ gem 'vmpooler-provider-gce',       '~> 1.0'
 gem 'vmpooler-provider-vsphere',   '~> 3.0'
 
 # For development install via a git branch use something like:
-# gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'my-feature'
+gem 'vmpooler', git: 'https://github.com/puppetlabs/vmpooler.git', branch: 'improve_ldap_bind'
 # gem 'vmpooler-dns-gcp', git: 'https://github.com/puppetlabs/vmpooler-dns-gcp.git', branch: 'my-feature'
 # gem 'vmpooler-provider-ec2', git: 'https://github.com/puppetlabs/vmpooler-provider-ec2.git', branch: 'my-feature'
 # gem 'vmpooler-provider-gce', git: 'https://github.com/puppetlabs/vmpooler-provider-gce.git', branch: 'my-feature'
diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock
index f5677db..1840a4f 100644
--- a/docker/Gemfile.lock
+++ b/docker/Gemfile.lock
@@ -1,3 +1,30 @@
+GIT
+  remote: https://github.com/puppetlabs/vmpooler.git
+  revision: 4ecc2fcb41a5c29b5f5d083bea80a0ea213fd89b
+  branch: improve_ldap_bind
+  specs:
+    vmpooler (3.3.0)
+      concurrent-ruby (~> 1.1)
+      connection_pool (~> 2.4)
+      deep_merge (~> 1.2)
+      net-ldap (~> 0.16)
+      opentelemetry-exporter-jaeger (= 0.23.0)
+      opentelemetry-instrumentation-concurrent_ruby (= 0.21.1)
+      opentelemetry-instrumentation-http_client (= 0.22.2)
+      opentelemetry-instrumentation-redis (= 0.25.3)
+      opentelemetry-instrumentation-sinatra (= 0.23.2)
+      opentelemetry-resource_detectors (= 0.24.1)
+      opentelemetry-sdk (~> 1.3, >= 1.3.0)
+      pickup (~> 0.0.11)
+      prometheus-client (>= 2, < 5)
+      puma (>= 5.0.4, < 7)
+      rack (>= 2.2, < 4.0)
+      rake (~> 13.0)
+      redis (~> 5.0)
+      sinatra (>= 2, < 4)
+      spicy-proton (~> 2.1)
+      statsd-ruby (~> 1.4)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -105,7 +132,7 @@ GEM
     pickup (0.0.11)
     prometheus-client (4.2.1)
     public_suffix (5.0.3)
-    puma (6.3.0-java)
+    puma (6.3.1-java)
       nio4r (~> 2.0)
     racc (1.7.1-java)
     rack (2.2.8)
@@ -119,7 +146,7 @@ GEM
       optimist (~> 3.0)
     redis (5.0.7)
       redis-client (>= 0.9.0)
-    redis-client (0.15.0)
+    redis-client (0.16.0)
       connection_pool
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -145,36 +172,15 @@ GEM
     tilt (2.2.0)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    vmpooler (3.3.0)
-      concurrent-ruby (~> 1.1)
-      connection_pool (~> 2.4)
-      deep_merge (~> 1.2)
-      net-ldap (~> 0.16)
-      opentelemetry-exporter-jaeger (= 0.23.0)
-      opentelemetry-instrumentation-concurrent_ruby (= 0.21.1)
-      opentelemetry-instrumentation-http_client (= 0.22.2)
-      opentelemetry-instrumentation-redis (= 0.25.3)
-      opentelemetry-instrumentation-sinatra (= 0.23.2)
-      opentelemetry-resource_detectors (= 0.24.1)
-      opentelemetry-sdk (~> 1.3, >= 1.3.0)
-      pickup (~> 0.0.11)
-      prometheus-client (>= 2, < 5)
-      puma (>= 5.0.4, < 7)
-      rack (>= 2.2, < 4.0)
-      rake (~> 13.0)
-      redis (~> 5.0)
-      sinatra (>= 2, < 4)
-      spicy-proton (~> 2.1)
-      statsd-ruby (~> 1.4)
     vmpooler-dns-gcp (1.2.0)
       google-cloud-dns (~> 0.35.1)
       googleauth (>= 0.16.2, < 1.3.0)
       vmpooler (~> 3.0)
-    vmpooler-provider-gce (1.2.0)
+    vmpooler-provider-gce (1.3.0)
       google-apis-compute_v1 (~> 0.14)
       googleauth (>= 0.16.2, < 1.4.0)
       vmpooler (~> 3.0)
-    vmpooler-provider-vsphere (3.2.0)
+    vmpooler-provider-vsphere (3.3.0)
       rbvmomi2 (>= 3.1, < 4.0)
       vmpooler (~> 3.0)
     webrick (1.8.1)
@@ -184,7 +190,7 @@ PLATFORMS
   universal-java-11
 
 DEPENDENCIES
-  vmpooler (~> 3.0)
+  vmpooler!
   vmpooler-dns-gcp (~> 1.0)
   vmpooler-provider-gce (~> 1.0)
   vmpooler-provider-vsphere (~> 3.0)
diff --git a/helm-charts/vmpooler/templates/configmap-vmpooler-baseconfig.yaml b/helm-charts/vmpooler/templates/configmap-vmpooler-baseconfig.yaml
index e914e3a..5b71e19 100644
--- a/helm-charts/vmpooler/templates/configmap-vmpooler-baseconfig.yaml
+++ b/helm-charts/vmpooler/templates/configmap-vmpooler-baseconfig.yaml
@@ -12,9 +12,11 @@ data:
     :tagfilter:
       project: '^([^/]+)'
 
+    {{- if .Values.auth }}
     :auth:
       {{- with .Values.auth }}
         {{- toYaml . | nindent 6 }}
       {{- end }}
+    {{- end }}
     :prometheus:
       prefix: {{ .Values.vmpoolerInstance }}