From c8810b9d239587145d018f1c019b79f76dc9daeb Mon Sep 17 00:00:00 2001 From: Stuart Paterson Date: Mon, 21 Jan 2019 10:21:45 +0000 Subject: [PATCH 1/2] Update google_pubsub_topics to accommodate more than one topic in the project under test. Signed-off-by: Stuart Paterson --- test/integration/verify/controls/google_pubsub_topics.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/verify/controls/google_pubsub_topics.rb b/test/integration/verify/controls/google_pubsub_topics.rb index ad9b77464..f1e1b15c4 100644 --- a/test/integration/verify/controls/google_pubsub_topics.rb +++ b/test/integration/verify/controls/google_pubsub_topics.rb @@ -24,12 +24,12 @@ describe google_pubsub_topics(project: gcp_project_id) do it { should exist } its('names') { should include topic['name'] } - its('count') { should eq 1 } + its('count') { should be >=1 } end google_pubsub_topics(project: gcp_project_id).names.each do |topic_name| describe google_pubsub_topic(project: gcp_project_id, name: topic_name) do - its('name') { should eq topic['name'] } + it { should exist } end end end From df452c4451eec4d35456b646f6dbda8c1b3db5fa Mon Sep 17 00:00:00 2001 From: Stuart Paterson Date: Mon, 21 Jan 2019 10:25:41 +0000 Subject: [PATCH 2/2] Update README with latest resources. Changelog and version bump to 0.9.0. Signed-off-by: Stuart Paterson --- CHANGELOG.md | 18 ++++++++++++++++++ README.md | 10 ++++++++++ inspec.yml | 2 +- test/integration/verify/inspec.yml | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d05b24f74..e51a39b9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Change Log +## [v0.9.0](https://github.com/inspec/inspec-gcp/tree/v0.9.0) (2019-01-21) +[Full Changelog](https://github.com/inspec/inspec-gcp/compare/v0.8.0...v0.9.0) + +**Merged pull requests:** + +- Add instance group manager and resource record set resources [\#100](https://github.com/inspec/inspec-gcp/pull/100) ([slevenick](https://github.com/slevenick)) +- Pubsub subscription + topic [\#99](https://github.com/inspec/inspec-gcp/pull/99) ([slevenick](https://github.com/slevenick)) +- Adding pagination for key rings and crypto keys resources. [\#97](https://github.com/inspec/inspec-gcp/pull/97) ([skpaterson](https://github.com/skpaterson)) +- Add compute disk resource [\#96](https://github.com/inspec/inspec-gcp/pull/96) ([slevenick](https://github.com/slevenick)) +- Feat/pubsub magicmodule [\#95](https://github.com/inspec/inspec-gcp/pull/95) ([jnahelou](https://github.com/jnahelou)) +- Fix for forwarding rules with nil network and update README. [\#93](https://github.com/inspec/inspec-gcp/pull/93) ([skpaterson](https://github.com/skpaterson)) +- Tweaks to MM SSL policies resources and update README. [\#92](https://github.com/inspec/inspec-gcp/pull/92) ([skpaterson](https://github.com/skpaterson)) +- Add support for google\_compute\_forwarding\_rules and google\_compute\_forwarding\_rule [\#91](https://github.com/inspec/inspec-gcp/pull/91) ([jnahelou](https://github.com/jnahelou)) +- Add Magic Modules generated resource for SSL Policy [\#90](https://github.com/inspec/inspec-gcp/pull/90) ([slevenick](https://github.com/slevenick)) +- Update README for new resources [\#85](https://github.com/inspec/inspec-gcp/pull/85) ([skpaterson](https://github.com/skpaterson)) +- Added support for google\_compute\_region\_instance\_group\_manager [\#84](https://github.com/inspec/inspec-gcp/pull/84) ([jnahelou](https://github.com/jnahelou)) +- Updating README with new resources and adding CHANGELOG for v0.8.0. [\#83](https://github.com/inspec/inspec-gcp/pull/83) ([skpaterson](https://github.com/skpaterson)) + ## [v0.8.0](https://github.com/inspec/inspec-gcp/tree/v0.8.0) (2018-11-23) [Full Changelog](https://github.com/inspec/inspec-gcp/compare/v0.7.0...v0.8.0) diff --git a/README.md b/README.md index ab1ca1769..c9a84612d 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,8 @@ supports: The following resources are available in the InSpec GCP Profile - [google_compute_address](docs/resources/google_compute_address.md) +- [google_compute_disk](docs/resources/google_compute_disk.md) +- [google_compute_disks](docs/resources/google_compute_disks.md) - [google_compute_firewall](docs/resources/google_compute_firewall.md) - [google_compute_firewalls](docs/resources/google_compute_firewalls.md) - [google_compute_forwarding_rule](docs/resources/google_compute_forwarding_rule.md) @@ -151,6 +153,8 @@ The following resources are available in the InSpec GCP Profile - [google_compute_image](docs/resources/google_compute_image.md) - [google_compute_instance](docs/resources/google_compute_instance.md) - [google_compute_instance_group](docs/resources/google_compute_instance_group.md) +- [google_compute_instance_group_manager](docs/resources/google_compute_instance_group_manager.md) +- [google_compute_instance_group_managers](docs/resources/google_compute_instance_group_managers.md) - [google_compute_instance_groups](docs/resources/google_compute_instance_groups.md) - [google_compute_instances](docs/resources/google_compute_instances.md) - [google_compute_network](docs/resources/google_compute_network.md) @@ -174,6 +178,8 @@ The following resources are available in the InSpec GCP Profile - [google_container_node_pools](docs/resources/google_container_node_pools.md) - [google_dns_managed_zone](docs/resources/google_dns_managed_zone.md) - [google_dns_managed_zones](docs/resources/google_dns_managed_zones.md) +- [google_dns_resource_record_set](docs/resources/google_dns_resource_record_set.md) +- [google_dns_resource_record_sets](docs/resources/google_dns_resource_record_sets.md) - [google_kms_crypto_key](docs/resources/google_kms_crypto_key.md) - [google_kms_crypto_key_iam_binding](docs/resources/google_kms_crypto_key_iam_binding.md) - [google_kms_crypto_key_iam_bindings](docs/resources/google_kms_crypto_key_iam_bindings.md) @@ -196,6 +202,10 @@ The following resources are available in the InSpec GCP Profile - [google_project_metric](docs/resources/google_project_metric.md) - [google_project_metrics](docs/resources/google_project_metrics.md) - [google_projects](docs/resources/google_projects.md) +- [google_pubsub_subscription](docs/resources/google_pubsub_subscription.md) +- [google_pubsub_subscriptions](docs/resources/google_pubsub_subscriptions.md) +- [google_pubsub_topic](docs/resources/google_pubsub_topic.md) +- [google_pubsub_topics](docs/resources/google_pubsub_topics.md) - [google_service_account](docs/resources/google_service_account.md) - [google_service_account_key](docs/resources/google_service_account_key.md) - [google_service_account_keys](docs/resources/google_service_account_keys.md) diff --git a/inspec.yml b/inspec.yml index c8d6da0dc..9884bea35 100644 --- a/inspec.yml +++ b/inspec.yml @@ -4,7 +4,7 @@ maintainer: spaterson@chef.io,russell.seymour@turtlesystems.co.uk summary: This resource pack provides compliance resources_old_ignore for Google Cloud Platform copyright: spaterson@chef.io,russell.seymour@turtlesystems.co.uk copyright_email: spaterson@chef.io,russell.seymour@turtlesystems.co.uk -version: 0.8.0 +version: 0.9.0 license: Apache-2.0 inspec_version: '>= 3.0.25' supports: diff --git a/test/integration/verify/inspec.yml b/test/integration/verify/inspec.yml index 60446ecc8..772313ef9 100644 --- a/test/integration/verify/inspec.yml +++ b/test/integration/verify/inspec.yml @@ -1,5 +1,5 @@ name: inspec-gcp-integration-tests -version: 0.8.0 +version: 0.9.0 inspec_version: '>= 3.0.25' depends: - name: inspec-gcp