remove assume role from int test

cloudfoundry · Nov 19, 2024 · 1bcdc68 · 1bcdc68
1 parent c694612
commit 1bcdc68
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ci/tasks/run-integration.yml b/ci/tasks/run-integration.yml
@@ -5,10 +5,11 @@ image_resource:
   source: {repository: bosh/integration}
 inputs:
   - name: bosh-cpi-src
+  - name: bosh-cpi-src-test
   - name: environment
   - name: stemcell
 run:
-  path: bosh-cpi-src/ci/tasks/run-integration.sh
+  path: bosh-cpi-src-test/ci/tasks/run-integration.sh
 params:
   AWS_ACCESS_KEY_ID:                       ""
   AWS_SECRET_ACCESS_KEY:                   ""

diff --git a/src/bosh_aws_cpi/spec/integration/spec_helper.rb b/src/bosh_aws_cpi/spec/integration/spec_helper.rb
@@ -19,7 +19,7 @@ def validate_minimum_permissions(logger)
       region: @region,
       access_key_id: @permissions_auditor_key_id,
       secret_access_key: @permissions_auditor_secret_key,
-      session_token: @permissions_auditor_session_token,
+      session_token: @session_token,
       logger: logger
     )
 
@@ -100,15 +100,20 @@ def set_assume_role_permissions
 RSpec.configure do |rspec_config|
   include IntegrationHelpers
   rspec_config.before(:all) do
-    set_assume_role_permissions
+    #set_assume_role_permissions
 
+    @access_key_id = ENV.fetch('BOSH_AWS_ACCESS_KEY_ID')
+    @secret_access_key = ENV.fetch('BOSH_AWS_SECRET_ACCESS_KEY')
+    @session_token = ENV.fetch('BOSH_AWS_SESSION_TOKEN', nil)
     @subnet_id = ENV.fetch('BOSH_AWS_SUBNET_ID')
     @subnet_zone = ENV.fetch('BOSH_AWS_SUBNET_ZONE')
     @kms_key_arn = ENV.fetch('BOSH_AWS_KMS_KEY_ARN')
     @kms_key_arn_override = ENV.fetch('BOSH_AWS_KMS_KEY_ARN_OVERRIDE')
     @region = ENV.fetch('BOSH_AWS_REGION', 'us-west-1')
     @default_key_name = ENV.fetch('BOSH_AWS_DEFAULT_KEY_NAME', 'bosh')
     @ami = ENV.fetch('BOSH_AWS_IMAGE_ID', 'ami-866d3ee6')
+    @permissions_auditor_key_id = ENV.fetch('BOSH_AWS_PERMISSIONS_AUDITOR_KEY_ID', nil)
+    @permissions_auditor_secret_key = ENV.fetch('BOSH_AWS_PERMISSIONS_AUDITOR_SECRET_KEY', nil)
 
     @cpi_api_version = ENV.fetch('BOSH_AWS_CPI_API_VERSION', 1).to_i
 
@@ -127,7 +132,7 @@ def set_assume_role_permissions
   end
 
   rspec_config.before(:each) do
-    set_assume_role_permissions
+    #set_assume_role_permissions
 
     @registry = instance_double(Bosh::Cpi::RegistryClient).as_null_object
     allow(Bosh::Cpi::RegistryClient).to receive(:new).and_return(@registry)