Fix credentials_path.

omazin · omazin · commit 55241dcbed03 · 2019-12-26T12:35:58.000+03:00
diff --git a/test/fixtures/shared/terraform.tfvars.example b/test/fixtures/shared/terraform.tfvars.example
@@ -1,7 +1,5 @@
 project_id = ""
 
-credentials_path_relative = "../../../../credentials.json"
-
 region = "us-central1"
 
 service_account = {
diff --git a/test/integration/instance_simple/controls/instance_simple.rb b/test/integration/instance_simple/controls/instance_simple.rb
@@ -13,11 +13,6 @@
 # limitations under the License.
 
 project_id = attribute('project_id')
-credentials_path = attribute('credentials_path')
-
-ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = File.absolute_path(
-  credentials_path,
-  File.join(__dir__, "../../../fixtures/compute_instance/simple"))
 
 expected_instances = 4
 
diff --git a/test/integration/instance_simple/inspec.yml b/test/integration/instance_simple/inspec.yml
@@ -18,6 +18,3 @@ attributes:
   - name: project_id
     required: true
     type: string
-  - name: credentials_path
-    required: true
-    type: string
diff --git a/test/integration/it_additional_disks/controls/it_additional_disks.rb b/test/integration/it_additional_disks/controls/it_additional_disks.rb
@@ -13,11 +13,6 @@
 # limitations under the License.
 
 project_id = attribute('project_id')
-credentials_path = attribute('credentials_path')
-
-ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = File.absolute_path(
-  credentials_path,
-  File.join(__dir__, "../../../fixtures/instance_template/additional_disks"))
 
 expected_templates = 1
 expected_disks = 4
diff --git a/test/integration/it_additional_disks/inspec.yml b/test/integration/it_additional_disks/inspec.yml
@@ -18,6 +18,3 @@ attributes:
   - name: project_id
     required: true
     type: string
-  - name: credentials_path
-    required: true
-    type: string
diff --git a/test/integration/it_simple/controls/it_simple.rb b/test/integration/it_simple/controls/it_simple.rb
@@ -13,11 +13,6 @@
 # limitations under the License.
 
 project_id = attribute('project_id')
-credentials_path = attribute('credentials_path')
-
-ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = File.absolute_path(
-  credentials_path,
-  File.join(__dir__, "../../../fixtures/instance_template/simple"))
 
 expected_templates = 1
 expected_disks = 1
diff --git a/test/integration/it_simple/inspec.yml b/test/integration/it_simple/inspec.yml
@@ -18,6 +18,3 @@ attributes:
   - name: project_id
     required: true
     type: string
-  - name: credentials_path
-    required: true
-    type: string
diff --git a/test/integration/mig_autoscaler/controls/mig_autoscaler.rb b/test/integration/mig_autoscaler/controls/mig_autoscaler.rb
@@ -13,13 +13,8 @@
 # limitations under the License.
 
 project_id = attribute('project_id')
-credentials_path = attribute('credentials_path')
 region     = attribute('region')
 
-ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = File.absolute_path(
-  credentials_path,
-  File.join(__dir__, "../../../fixtures/mig/autoscaler"))
-
 expected_instances = 4
 expected_instance_groups = 1
 
diff --git a/test/integration/mig_autoscaler/inspec.yml b/test/integration/mig_autoscaler/inspec.yml
@@ -18,9 +18,6 @@ attributes:
   - name: project_id
     required: true
     type: string
-  - name: credentials_path
-    required: true
-    type: string
   - name: region
     required: true
     type: string
diff --git a/test/integration/mig_simple/controls/mig_simple.rb b/test/integration/mig_simple/controls/mig_simple.rb
@@ -13,13 +13,8 @@
 # limitations under the License.
 
 project_id = attribute('project_id')
-credentials_path = attribute('credentials_path')
 region     = attribute('region')
 
-ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = File.absolute_path(
-  credentials_path,
-  File.join(__dir__, "../../../fixtures/mig/simple"))
-
 expected_instances = 4
 expected_instance_groups = 1
 
diff --git a/test/integration/mig_simple/inspec.yml b/test/integration/mig_simple/inspec.yml
@@ -18,9 +18,6 @@ attributes:
   - name: project_id
     required: true
     type: string
-  - name: credentials_path
-    required: true
-    type: string
   - name: region
     required: true
     type: string
diff --git a/test/integration/mig_with_percent_simple/controls/mig_with_percent_simple.rb b/test/integration/mig_with_percent_simple/controls/mig_with_percent_simple.rb
@@ -13,13 +13,8 @@
 # limitations under the License.
 
 project_id = attribute('project_id')
-credentials_path = attribute('credentials_path')
 region     = attribute('region')
 
-ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = File.absolute_path(
-  credentials_path,
-  File.join(__dir__, "../../../fixtures/mig_with_percent/simple"))
-
 expected_instances = 4
 expected_instance_groups = 1
 
diff --git a/test/integration/mig_with_percent_simple/inspec.yml b/test/integration/mig_with_percent_simple/inspec.yml
@@ -18,9 +18,6 @@ attributes:
   - name: project_id
     required: true
     type: string
-  - name: credentials_path
-    required: true
-    type: string
   - name: region
     required: true
     type: string
diff --git a/test/integration/preemptible_and_regular_instance_templates_simple/controls/simple.rb b/test/integration/preemptible_and_regular_instance_templates_simple/controls/simple.rb
@@ -13,11 +13,6 @@
 # limitations under the License.
 
 project_id = attribute('project_id')
-credentials_path = attribute('credentials_path')
-
-ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = File.absolute_path(
-  credentials_path,
-  File.join(__dir__, "../../../fixtures/preemptible_and_regular_instance_templates/simple"))
 
 expected_templates = 1
 expected_disks = 1
diff --git a/test/integration/preemptible_and_regular_instance_templates_simple/inspec.yml b/test/integration/preemptible_and_regular_instance_templates_simple/inspec.yml
@@ -18,6 +18,3 @@ attributes:
   - name: project_id
     required: true
     type: string
-  - name: credentials_path
-    required: true
-    type: string
diff --git a/test/integration/umig_named_ports/controls/umig_named_ports.rb b/test/integration/umig_named_ports/controls/umig_named_ports.rb
@@ -13,11 +13,6 @@
 # limitations under the License.
 
 project_id = attribute('project_id')
-credentials_path = attribute('credentials_path')
-
-ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = File.absolute_path(
-  credentials_path,
-  File.join(__dir__, "../../../fixtures/umig/named_ports"))
 
 expected_instances = 4
 expected_instance_groups = 4
diff --git a/test/integration/umig_named_ports/inspec.yml b/test/integration/umig_named_ports/inspec.yml
@@ -18,6 +18,3 @@ attributes:
   - name: project_id
     required: true
     type: string
-  - name: credentials_path
-    required: true
-    type: string
diff --git a/test/integration/umig_simple/controls/umig_simple.rb b/test/integration/umig_simple/controls/umig_simple.rb
@@ -13,11 +13,6 @@
 # limitations under the License.
 
 project_id = attribute('project_id')
-credentials_path = attribute('credentials_path')
-
-ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = File.absolute_path(
-  credentials_path,
-  File.join(__dir__, "../../../fixtures/umig/simple"))
 
 expected_instances = 4
 expected_instance_groups = 4
diff --git a/test/integration/umig_simple/inspec.yml b/test/integration/umig_simple/inspec.yml
@@ -18,6 +18,3 @@ attributes:
   - name: project_id
     required: true
     type: string
-  - name: credentials_path
-    required: true
-    type: string
diff --git a/test/integration/umig_static_ips/controls/umig_static_ips.rb b/test/integration/umig_static_ips/controls/umig_static_ips.rb
@@ -13,11 +13,6 @@
 # limitations under the License.
 
 project_id = attribute('project_id')
-credentials_path = attribute('credentials_path')
-
-ENV['CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE'] = File.absolute_path(
-  credentials_path,
-  File.join(__dir__, "../../../fixtures/umig/umig_static_ips"))
 
 expected_instances = 4
 expected_instance_groups = 4
diff --git a/test/integration/umig_static_ips/inspec.yml b/test/integration/umig_static_ips/inspec.yml
@@ -18,6 +18,3 @@ attributes:
   - name: project_id
     required: true
     type: string
-  - name: credentials_path
-    required: true
-    type: string
