Skip to content

Commit

Permalink
[Disable Sudo] Invoking sudo_access from platform cookbook when we up…
Browse files Browse the repository at this point in the history
…date the Nodes. (aws#2646)

Co-authored-by: Himani Deshpande <[email protected]>
  • Loading branch information
himani2411 and Himani Deshpande authored Feb 13, 2024
1 parent 7a37905 commit e4fee1f
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 5 deletions.
7 changes: 2 additions & 5 deletions cookbooks/aws-parallelcluster-entrypoints/recipes/update.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
# limitations under the License.

fetch_config 'Fetch and load cluster configs' do
update true
end
# Fetch and load cluster configs
include_recipe 'aws-parallelcluster-platform::update'

# generate the updated shared storages mapping file
include_recipe 'aws-parallelcluster-environment::update_fs_mapping'
Expand All @@ -26,5 +25,3 @@
if is_custom_node?
include_recipe 'aws-parallelcluster-computefleet::update_parallelcluster_node'
end

sudo_access "Update Sudo Access" if node['cluster']['scheduler'] == 'slurm'
22 changes: 22 additions & 0 deletions cookbooks/aws-parallelcluster-platform/recipes/update.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# frozen_string_literal: true

#
# Cookbook:: aws-parallelcluster-platform
# Recipe:: update
#
# Copyright:: 2013-2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the
# License. A copy of the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
# limitations under the License.

fetch_config 'Fetch and load cluster configs' do
update true
end

sudo_access "Update Sudo Access" if node['cluster']['scheduler'] == 'slurm'
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# frozen_string_literal: true

# Copyright:: 2024 Amazon.com, Inc. and its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the
# License. A copy of the License is located at
#
# http://aws.amazon.com/apache2.0/
#
# or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
# limitations under the License.

require 'spec_helper'

describe 'aws-parallelcluster-platform::update' do
for_all_oses do |platform, version|
context "on #{platform}#{version}" do
context "when scheduler is slurm" do
cached(:chef_run) do
runner = runner(platform: platform, version: version) do |node|
node.override['cluster']['scheduler'] = 'slurm'
end
runner.converge(described_recipe)
end
cached(:node) { chef_run.node }

it 'it fetches and updates cluster configs' do
is_expected.to run_fetch_config('Fetch and load cluster configs')
end
it 'it updates sudo access' do
is_expected.to setup_sudo_access('Update Sudo Access')
end
end

context "when scheduler is awsbatch" do
cached(:chef_run) do
runner = runner(platform: platform, version: version) do |node|
node.override['cluster']['scheduler'] = 'awsbatch'
end
runner.converge(described_recipe)
end
cached(:node) { chef_run.node }

it 'it fetches and updates cluster configs' do
is_expected.to run_fetch_config('Fetch and load cluster configs')
end
it 'it doesnt update sudo access' do
is_expected.not_to setup_sudo_access('Update Sudo Access')
end
end
end
end
end

0 comments on commit e4fee1f

Please sign in to comment.