Updates to support Globus Connect Server 5.4.61+ (treydock#41)

* Remove client_id and client_secret parameters * Add project_id and project_admin parameters Fixes treydock#37
kuleuven · Nov 29, 2023 · 4e15969 · 4e15969
1 parent d5096b2
commit 4e15969
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ This module manages Globus Connect Server.
 
 ### Supported Versions of Globus
 
-Currently this module supports Globus 5.4.
+Currently this module supports Globus 5.4, at least 5.4.61
 
 | Globus Version | Globus Puppet module versions |
 | -------------- | ----------------------------- |
@@ -29,8 +29,6 @@ The following is the minimum parameters that must be passed to setup Globus v5.4
 ```puppet
 class { 'globus':
   display_name  => 'REPLACE My Site Globus',
-  client_id     => 'REPLACE-client-id-from-globus',
-  client_secret => 'REPLACE-client-id-from-globus',
   owner         => '[email protected]',
   organization  => 'REPLACE-My Site',
 }

diff --git a/lib/puppet/functions/globus/endpoint_setup_args.rb b/lib/puppet/functions/globus/endpoint_setup_args.rb
@@ -7,9 +7,9 @@
   def args(values)
     flags = []
     flags << "'#{values['display_name']}'"
-    flags << "--client-id #{values['client_id']}"
-    flags << "--secret '#{values['client_secret']}'"
     flags << "--owner '#{values['owner']}'"
+    flags << "--project-id '#{values['project_id']}" unless values['project_id'].nil?
+    flags << "--project-admin '#{values['project_admin']}" unless values['project_admin'].nil?
     flags << "--organization '#{values['organization']}'"
     flags << "--deployment-key #{values['deployment_key']}"
     flags << '--agree-to-letsencrypt-tos'

diff --git a/lib/puppet/functions/globus/node_setup_args.rb b/lib/puppet/functions/globus/node_setup_args.rb
@@ -6,7 +6,6 @@
   end
   def args(values)
     flags = []
-    flags << "--client-id #{values['client_id']}"
     flags << "--deployment-key #{values['deployment_key']}"
     flags << "--incoming-port-range #{values['incoming_port_range'].join(' ')}" unless values['incoming_port_range'].nil?
     flags << "--outgoing-port-range #{values['outgoing_port_range'].join(' ')}" unless values['outgoing_port_range'].nil?

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -3,9 +3,9 @@
 class globus::config {
   $endpoint_setup_args = globus::endpoint_setup_args({
       display_name => $globus::display_name,
-      client_id => $globus::client_id,
-      client_secret => $globus::client_secret,
       owner => $globus::owner,
+      project_id => $globus::project_id,
+      project_admin => $globus::project_admin,
       deployment_key => $globus::deployment_key,
       organization => $globus::organization,
       keywords => $globus::keywords,
@@ -23,10 +23,9 @@
     group     => 'root',
     mode      => '0700',
     show_diff => false,
-    content   => "export GLOBUS_CLIENT_SECRET=${globus::client_secret}\n${endpoint_setup}\n",
+    content   => "${endpoint_setup}\n",
   }
   $node_setup_args = globus::node_setup_args({
-      client_id => $globus::client_id,
       deployment_key => $globus::deployment_key,
       incoming_port_range => $globus::incoming_port_range,
       outgoing_port_range => $globus::outgoing_port_range,
@@ -41,23 +40,21 @@
     group     => 'root',
     mode      => '0700',
     show_diff => false,
-    content   => "export GLOBUS_CLIENT_SECRET=${globus::client_secret}\n${node_setup}\n",
+    content   => "${node_setup}\n",
   }
   if $globus::run_setup_commands {
     exec { 'globus-endpoint-setup':
-      path        => '/usr/bin:/bin:/usr/sbin:/sbin',
-      command     => $endpoint_setup,
-      environment => ["GLOBUS_CLIENT_SECRET=${globus::client_secret}"],
-      creates     => $globus::deployment_key,
-      logoutput   => true,
+      path      => '/usr/bin:/bin:/usr/sbin:/sbin',
+      command   => $endpoint_setup,
+      creates   => $globus::deployment_key,
+      logoutput => true,
     }
     exec { 'globus-node-setup':
-      path        => '/usr/bin:/bin:/usr/sbin:/sbin',
-      command     => $node_setup,
-      environment => ["GLOBUS_CLIENT_SECRET=${globus::client_secret}"],
-      unless      => 'test -s /var/lib/globus-connect-server/info.json',
-      logoutput   => true,
-      require     => Exec['globus-endpoint-setup'],
+      path      => '/usr/bin:/bin:/usr/sbin:/sbin',
+      command   => $node_setup,
+      unless    => 'test -s /var/lib/globus-connect-server/info.json',
+      logoutput => true,
+      require   => Exec['globus-endpoint-setup'],
     }
   }
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -3,8 +3,6 @@
 # @example Install and setup a Globus v5.4 endpoint
 #   class { 'globus':
 #     display_name  => 'REPLACE My Site Globus',
-#     client_id     => 'REPLACE-client-id-from-globus',
-#     client_secret => 'REPLACE-client-id-from-globus',
 #     owner         => '[email protected]',
 #   }
 #
@@ -36,10 +34,10 @@
 #   Globus package name
 # @param display_name
 #   Display name to use when running 'globus-connect-server endpoint setup'
-# @param client_id
-#   --client-id use when running 'globus-connect-server endpoint setup'
-# @param client_secret
-#   --client-secret use when running 'globus-connect-server endpoint setup'
+# @param project_id
+#   --project-id use when running 'globus-connect-server endpoint setup'
+# @param project_admin
+#   --project-admin use when running 'globus-connect-server endpoint setup'
 # @param owner
 #   --owner use when running 'globus-connect-server endpoint setup'
 # @param organization
@@ -75,8 +73,6 @@
 class globus (
   # Required
   String[1] $display_name,
-  String[1] $client_id,
-  String[1] $client_secret,
   String[1] $owner,
   String[1] $organization,
 
@@ -97,6 +93,8 @@
   Stdlib::Absolutepath $deployment_key = '/var/lib/globus-connect-server/gcs-manager/deployment-key.json',
 
   # endpoint setup
+  Optional[String[1]] $project_id = undef,
+  Optional[String[1]] $project_admin = undef,
   Optional[Array] $keywords = undef,
   Optional[String] $department = undef,
   Optional[String] $contact_email = undef,

diff --git a/spec/acceptance/globus_spec.rb b/spec/acceptance/globus_spec.rb
@@ -8,8 +8,6 @@
       pp = "
       class { 'globus':
         display_name        => 'REPLACE My Site Globus',
-        client_id           => 'REPLACE-client-id-from-globus',
-        client_secret       => 'REPLACE-client-id-from-globus',
         owner               => '[email protected]',
         organization        => 'REPLACE-My Site',
         run_setup_commands  => false,

diff --git a/spec/classes/globus_spec.rb b/spec/classes/globus_spec.rb
@@ -11,8 +11,6 @@
 
       let(:default_params) do
         {
-          client_id: 'foo',
-          client_secret: 'bar',
           owner: '[email protected]',
           display_name: 'Example',
           organization: 'Example'

diff --git a/spec/shared_examples/globus_config.rb b/spec/shared_examples/globus_config.rb
@@ -4,7 +4,7 @@
   let(:endpoint_setup) do
     [
       'globus-connect-server endpoint setup',
-      "'Example' --client-id foo --secret 'bar'",
+      "'Example'",
       "--owner '[email protected]'",
       "--organization 'Example'",
       '--deployment-key /var/lib/globus-connect-server/gcs-manager/deployment-key.json',
@@ -14,7 +14,6 @@
   let(:node_setup) do
     [
       'globus-connect-server node setup',
-      '--client-id foo',
       '--deployment-key /var/lib/globus-connect-server/gcs-manager/deployment-key.json',
       '--incoming-port-range 50000 51000',
       '--ip-address 172.16.254.254'
@@ -28,9 +27,7 @@
       group: 'root',
       mode: '0700',
       show_diff: 'false',
-      content: "export GLOBUS_CLIENT_SECRET=bar
-#{endpoint_setup.join(' ')}
-",
+      content: "#{endpoint_setup.join(' ')}\n",
     )
   end
 
@@ -41,17 +38,14 @@
       group: 'root',
       mode: '0700',
       show_diff: 'false',
-      content: "export GLOBUS_CLIENT_SECRET=bar
-#{node_setup.join(' ')}
-",
+      content: "#{node_setup.join(' ')}\n",
     )
   end
 
   it 'has endpoint setup command' do
     is_expected.to contain_exec('globus-endpoint-setup').with(
       path: '/usr/bin:/bin:/usr/sbin:/sbin',
       command: endpoint_setup.join(' '),
-      environment: ['GLOBUS_CLIENT_SECRET=bar'],
       creates: '/var/lib/globus-connect-server/gcs-manager/deployment-key.json',
       logoutput: 'true',
     )
@@ -61,7 +55,6 @@
     is_expected.to contain_exec('globus-node-setup').with(
       path: '/usr/bin:/bin:/usr/sbin:/sbin',
       command: node_setup.join(' '),
-      environment: ['GLOBUS_CLIENT_SECRET=bar'],
       unless: 'test -s /var/lib/globus-connect-server/info.json',
       logoutput: 'true',
       require: 'Exec[globus-endpoint-setup]',