Inspec attribute changes

modular-magician · Dec 12, 2018 · 11542aa · 11542aa
1 parent 10fa4f2
commit 11542aa
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 12 deletions.
diff --git a/docs/resources/google_compute_ssl_policies.md b/docs/resources/google_compute_ssl_policies.md
@@ -9,16 +9,15 @@ A `google_compute_ssl_policies` is used to test a Google SslPolicy resource
 
 ## Examples
 ```
-resource = google_compute_ssl_policies({project: 'graphite-test-sam-chef'})
-describe resource do
+describe google_compute_ssl_policies({project: ''}) do
   it { should exist }
   its('names') { should include 'inspec-gcp-ssl-policy' }
   its('profiles') { should include 'CUSTOM' }
   its('count') { should eq 1 }
 end
 
-resource.names.each do |policy_name|
-  describe google_compute_ssl_policy({project: 'graphite-test-sam-chef', name: policy_name}) do
+google_compute_ssl_policies({project: ''}).names.each do |policy_name|
+  describe google_compute_ssl_policy({project: '', name: policy_name}) do
     its('min_tls_version') { should cmp 'TLS_1_2' }
   end
 end

diff --git a/docs/resources/google_compute_ssl_policy.md b/docs/resources/google_compute_ssl_policy.md
@@ -9,7 +9,7 @@ A `google_compute_ssl_policy` is used to test a Google SslPolicy resource
 
 ## Examples
 ```
-describe google_compute_ssl_policy({project: 'graphite-test-sam-chef', name: 'inspec-gcp-ssl-policy'}) do
+describe google_compute_ssl_policy({project: '', name: 'inspec-gcp-ssl-policy'}) do
   it { should exist }
   its('min_tls_version') { should cmp 'TLS_1_2' }
   its('profile') { should cmp 'CUSTOM' }

diff --git a/libraries/google/compute/property/sslpolicy_warnings.rb b/libraries/google/compute/property/sslpolicy_warnings.rb
@@ -13,7 +13,7 @@
 #     CONTRIBUTING.md located at the root of this package.
 #
 # ----------------------------------------------------------------------------
-module Google
+module GoogleInSpec
   module Compute
     module Property
       class SslPolicyWarnings

diff --git a/libraries/google_compute_ssl_policy.rb b/libraries/google_compute_ssl_policy.rb
@@ -56,7 +56,7 @@ def parse
     @enabled_features = @fetched['enabledFeatures']
     @custom_features = @fetched['customFeatures']
     @fingerprint = @fetched['fingerprint']
-    @warnings = Google::Compute::Property::SslPolicyWarningsArray.parse(@fetched['warnings'])
+    @warnings = GoogleInSpec::Compute::Property::SslPolicyWarningsArray.parse(@fetched['warnings'])
   end
 
   def exists?

diff --git a/test/integration/build/gcp-mm.tf b/test/integration/build/gcp-mm.tf
@@ -0,0 +1,33 @@
+variable "ssl_policy" {
+  type = "map"
+}
+
+resource "google_compute_ssl_policy" "custom-ssl-policy" {
+  name            = "${var.ssl_policy["name"]}"
+  min_tls_version = "${var.ssl_policy["min_tls_version"]}"
+  profile         = "${var.ssl_policy["profile"]}"
+  custom_features = ["${var.ssl_policy["custom_feature"]}", "${var.ssl_policy["custom_feature2"]}"]
+  project = "${var.gcp_project_id}"
+}
+
+resource "google_service_account" "inspecaccount" {
+  account_id = "inspec-account"
+  display_name = "InSpec Service Account"
+  project = "${var.gcp_project_id}"
+}
+
+resource "google_service_account_key" "inspeckey" {
+  service_account_id = "${google_service_account.inspecaccount.name}"
+  public_key_type = "TYPE_X509_PEM_FILE"
+}
+
+resource "google_project_iam_member" "inspec-iam-member" {
+  role = "roles/viewer"
+  member = "serviceAccount:${google_service_account.inspecaccount.email}"
+  project = "${var.gcp_project_id}"
+}
+
+resource "local_file" "file" {
+  content = "${base64decode(google_service_account_key.inspeckey.private_key)}"
+  filename = "${path.module}/inspec.json"
+}
diff --git a/test/integration/configuration/mm-attributes.yml b/test/integration/configuration/mm-attributes.yml
@@ -0,0 +1,6 @@
+ssl_policy:
+  name: 'inspec-gcp-ssl-policy'
+  min_tls_version: 'TLS_1_2'
+  profile: 'CUSTOM'
+  custom_feature: 'TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384'
+  custom_feature2: 'TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384'
diff --git a/test/integration/verify-mm/controls/google_compute_ssl_policies.rb b/test/integration/verify-mm/controls/google_compute_ssl_policies.rb
@@ -14,21 +14,20 @@
 
 title 'Test GCP google_compute_ssl_policies resource.'
 
-project_name = attribute('project_name', default: 'graphite-test-sam-chef')
+project_name = attribute(:gcp_project_name, default: '')
 ssl_policy = attribute('ssl_policy', default: {"name"=>"inspec-gcp-ssl-policy", "min_tls_version"=>"TLS_1_2", "profile"=>"CUSTOM", "custom_feature"=>"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "custom_feature2"=>"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"})
 control 'google_compute_ssl_policies-1.0' do
   impact 1.0
   title 'google_compute_ssl_policies resource test'
 
-  resource = google_compute_ssl_policies({project: project_name})
-  describe resource do
+  describe google_compute_ssl_policies({project: project_name}) do
     it { should exist }
     its('names') { should include ssl_policy['name'] }
     its('profiles') { should include ssl_policy['profile'] }
     its('count') { should eq 1 }
   end
 
-  resource.names.each do |policy_name|
+  google_compute_ssl_policies({project: project_name}).names.each do |policy_name|
     describe google_compute_ssl_policy({project: project_name, name: policy_name}) do
       its('min_tls_version') { should cmp ssl_policy['min_tls_version'] }
     end

diff --git a/test/integration/verify-mm/controls/google_compute_ssl_policy.rb b/test/integration/verify-mm/controls/google_compute_ssl_policy.rb
@@ -14,7 +14,7 @@
 
 title 'Test GCP google_compute_ssl_policy resource.'
 
-project_name = attribute('project_name', default: 'graphite-test-sam-chef')
+project_name = attribute(:gcp_project_name, default: '')
 ssl_policy = attribute('ssl_policy', default: {"name"=>"inspec-gcp-ssl-policy", "min_tls_version"=>"TLS_1_2", "profile"=>"CUSTOM", "custom_feature"=>"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "custom_feature2"=>"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"})
 control 'google_compute_ssl_policy-1.0' do
   impact 1.0