From 10c31ac1aa84180258c3431bcb67b1fb7710b00e Mon Sep 17 00:00:00 2001 From: Sam Levenick Date: Tue, 12 Feb 2019 16:31:52 -0800 Subject: [PATCH] Remove domain access that fails to work --- .../google_bigquery_dataset/google_bigquery_dataset.erb | 9 --------- templates/inspec/tests/integration/build/gcp-mm.tf | 9 ++------- .../tests/integration/configuration/mm-attributes.yml | 2 -- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/templates/inspec/examples/google_bigquery_dataset/google_bigquery_dataset.erb b/templates/inspec/examples/google_bigquery_dataset/google_bigquery_dataset.erb index 9d7dd1a3cc72..3b36bb056543 100644 --- a/templates/inspec/examples/google_bigquery_dataset/google_bigquery_dataset.erb +++ b/templates/inspec/examples/google_bigquery_dataset/google_bigquery_dataset.erb @@ -9,15 +9,6 @@ describe google_bigquery_dataset(project: <%= doc_generation ? "#{gcp_project_id its('default_table_expiration_ms') { should cmp <%= doc_generation ? "'#{dataset['default_table_expiration_ms']}'" : "dataset['default_table_expiration_ms']" -%> } end -describe.one do - google_bigquery_dataset(project: <%= doc_generation ? "#{gcp_project_id}" : "gcp_project_id" -%>, name: <%= doc_generation ? "'#{dataset['dataset_id']}'" : "dataset['dataset_id']" -%>).access.each do |dataset_access| - describe dataset_access do - its('role') { should eq <%= doc_generation ? "'#{dataset['access_reader_role']}'" : "dataset['access_reader_role']" -%> } - its('domain') { should eq <%= doc_generation ? "'#{dataset['access_reader_domain']}'" : "dataset['access_reader_domain']" -%> } - end - end -end - describe.one do google_bigquery_dataset(project: <%= doc_generation ? "#{gcp_project_id}" : "gcp_project_id" -%>, name: <%= doc_generation ? "'#{dataset['dataset_id']}'" : "dataset['dataset_id']" -%>).access.each do |dataset_access| describe dataset_access do diff --git a/templates/inspec/tests/integration/build/gcp-mm.tf b/templates/inspec/tests/integration/build/gcp-mm.tf index f1d6145cbe6c..cedbc52b0e93 100644 --- a/templates/inspec/tests/integration/build/gcp-mm.tf +++ b/templates/inspec/tests/integration/build/gcp-mm.tf @@ -412,17 +412,12 @@ resource "google_bigquery_dataset" "gcp-inspec-dataset" { default_table_expiration_ms = "${var.dataset["default_table_expiration_ms"]}" access { - role = "${var.dataset["access_reader_role"]}" - domain = "${var.dataset["access_reader_domain"]}" - } - - access { - role = "${var.dataset["access_writer_role"]}" + role = "${var.dataset["access_writer_role"]}" special_group = "${var.dataset["access_writer_special_group"]}" } access { - role = "OWNER" + role = "OWNER" special_group = "projectOwners" } } diff --git a/templates/inspec/tests/integration/configuration/mm-attributes.yml b/templates/inspec/tests/integration/configuration/mm-attributes.yml index 66a8583ae039..b7ca91f400cf 100644 --- a/templates/inspec/tests/integration/configuration/mm-attributes.yml +++ b/templates/inspec/tests/integration/configuration/mm-attributes.yml @@ -176,8 +176,6 @@ dataset: description: Test BigQuery dataset description location: EU default_table_expiration_ms: 3600000 - access_reader_role: READER - access_reader_domain: example.com access_writer_role: WRITER access_writer_special_group: projectWriters