From 845013819de3f5e999b9e588b23544b80cc1c02c Mon Sep 17 00:00:00 2001
From: balasubramanian-s <balasubramanian.s@progress.com>
Date: Mon, 1 Jul 2024 18:34:20 +0530
Subject: [PATCH] update testcases

Signed-off-by: balasubramanian-s <balasubramanian.s@progress.com>
---
 ...ter.md => google_bigtableadmin_cluster.md} | 19 +++---
 .../google_bigtableadmin_clusters.md          | 64 +++++++++++++++++++
 ...bigtableadmin_project_instance_clusters.md | 60 -----------------
 ...er_config.rb => cluster_cluster_config.rb} | 12 ++--
 ...ster_config_cluster_autoscaling_config.rb} | 12 ++--
 ..._autoscaling_config_autoscaling_limits.rb} |  4 +-
 ...autoscaling_config_autoscaling_targets.rb} |  4 +-
 ...config.rb => cluster_encryption_config.rb} |  4 +-
 ...ter.rb => google_bigtableadmin_cluster.rb} | 22 +++----
 ...rs.rb => google_bigtableadmin_clusters.rb} | 12 ++--
 .../controls/google_bigtableadmin_cluster.rb  | 42 ++++++++++++
 .../controls/google_bigtableadmin_clusters.rb | 37 +++++++++++
 ..._bigtableadmin_project_instance_cluster.rb | 42 ------------
 ...bigtableadmin_project_instance_clusters.rb | 33 ----------
 14 files changed, 187 insertions(+), 180 deletions(-)
 rename docs/resources/{google_bigtableadmin_project_instance_cluster.md => google_bigtableadmin_cluster.md} (80%)
 create mode 100644 docs/resources/google_bigtableadmin_clusters.md
 delete mode 100644 docs/resources/google_bigtableadmin_project_instance_clusters.md
 rename libraries/google/bigtableadmin/property/{projectinstancecluster_cluster_config.rb => cluster_cluster_config.rb} (62%)
 rename libraries/google/bigtableadmin/property/{projectinstancecluster_cluster_config_cluster_autoscaling_config.rb => cluster_cluster_config_cluster_autoscaling_config.rb} (62%)
 rename libraries/google/bigtableadmin/property/{projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_limits.rb => cluster_cluster_config_cluster_autoscaling_config_autoscaling_limits.rb} (84%)
 rename libraries/google/bigtableadmin/property/{projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_targets.rb => cluster_cluster_config_cluster_autoscaling_config_autoscaling_targets.rb} (84%)
 rename libraries/google/bigtableadmin/property/{projectinstancecluster_encryption_config.rb => cluster_encryption_config.rb} (88%)
 rename libraries/{google_bigtableadmin_project_instance_cluster.rb => google_bigtableadmin_cluster.rb} (65%)
 rename libraries/{google_bigtableadmin_project_instance_clusters.rb => google_bigtableadmin_clusters.rb} (87%)
 create mode 100644 test/integration/verify/controls/google_bigtableadmin_cluster.rb
 create mode 100644 test/integration/verify/controls/google_bigtableadmin_clusters.rb
 delete mode 100644 test/integration/verify/controls/google_bigtableadmin_project_instance_cluster.rb
 delete mode 100644 test/integration/verify/controls/google_bigtableadmin_project_instance_clusters.rb

diff --git a/docs/resources/google_bigtableadmin_project_instance_cluster.md b/docs/resources/google_bigtableadmin_cluster.md
similarity index 80%
rename from docs/resources/google_bigtableadmin_project_instance_cluster.md
rename to docs/resources/google_bigtableadmin_cluster.md
index c9e20973..cd1036d2 100644
--- a/docs/resources/google_bigtableadmin_project_instance_cluster.md
+++ b/docs/resources/google_bigtableadmin_cluster.md
@@ -1,6 +1,6 @@
 +++
 
-title = "google_bigtableadmin_project_instance_cluster Resource"
+title = "google_bigtableadmin_cluster Resource"
 platform = "gcp"
 draft = false
 gh_repo = "inspec-gcp"
@@ -8,40 +8,39 @@ gh_repo = "inspec-gcp"
 
 [menu.inspec]
 
-title = "google_bigtableadmin_project_instance_cluster"
-identifier = "inspec/resources/gcp/google_bigtableadmin_project_instance_cluster Resource"
+title = "google_bigtableadmin_cluster"
+identifier = "inspec/resources/gcp/google_bigtableadmin_cluster Resource"
 parent = "inspec/resources/gcp"
 +++
 
-Use the `google_bigtableadmin_project_instance_cluster` InSpec audit resource to test the properties of a test a Google ProjectInstanceCluster.
+Use the `google_bigtableadmin_cluster` InSpec audit resource to test the properties of a test a Google ProjectInstanceCluster.
 
 ## Installation
 {{% inspec_gcp_install %}}
 
 ## Syntax
-A `google_bigtableadmin_project_instance_cluster` is used to test a Google ProjectInstanceCluster resource
+A `google_bigtableadmin_cluster` is used to test a Google ProjectInstanceCluster resource
 
 ## Examples
 ```
-describe google_bigtableadmin_project_instance_cluster(name: ' value_name') do
+describe google_bigtableadmin_cluster(name: 'value_name') do
 	it { should exist }
 	its('name') { should cmp 'value_name' }
 	its('location') { should cmp 'value_location' }
 	its('state') { should cmp 'value_state' }
 	its('default_storage_type') { should cmp 'value_defaultstoragetype' }
-
 end
 
-describe google_bigtableadmin_project_instance_cluster(name: "does_not_exit") do
+describe google_bigtableadmin_cluster(name: "does_not_exit") do
 	it { should_not exist }
 end
 ```
 
 ## Parameters
-Properties that can be accessed from the `google_bigtableadmin_project_instance_cluster` resource:
+Properties that can be accessed from the `google_bigtableadmin_cluster` resource:
 
 ## Properties
-Properties that can be accessed from the `google_bigtableadmin_project_instance_cluster` resource:
+Properties that can be accessed from the `google_bigtableadmin_cluster` resource:
 
 
   * `name`: The unique name of the cluster. Values are of the form `projects/{project}/instances/{instance}/clusters/a-z*`.
diff --git a/docs/resources/google_bigtableadmin_clusters.md b/docs/resources/google_bigtableadmin_clusters.md
new file mode 100644
index 00000000..d16a1839
--- /dev/null
+++ b/docs/resources/google_bigtableadmin_clusters.md
@@ -0,0 +1,64 @@
++++
+
+title = "google_bigtableadmin_clusters Resource"
+platform = "gcp"
+draft = false
+gh_repo = "inspec-gcp"
+
+
+[menu.inspec]
+
+title = "google_bigtableadmin_clusters"
+identifier = "inspec/resources/gcp/google_bigtableadmin_clusters Resource"
+parent = "inspec/resources/gcp"
++++
+
+Use the `google_bigtableadmin_clusters` InSpec audit resource to test the properties of a test a Google ProjectInstanceCluster.
+
+## Installation
+{{% inspec_gcp_install %}}
+
+## Syntax
+A `google_bigtableadmin_clusters` is used to test a Google ProjectInstanceCluster resource
+
+## Examples
+```
+  describe google_bigtableadmin_clusters(parent: ' value_parent') do
+    it { should exist }
+    its('names') { should include 'value_name' }
+    its('locations') { should include 'value_location' }
+    its('states') { should include 'value_state' }
+    its('default_storage_types') { should include 'value_defaultstoragetype' }
+  end
+```
+
+## Parameters
+Properties that can be accessed from the `google_bigtableadmin_clusters` resource:
+
+See [google_bigtableadmin_cluster.md](google_bigtableadmin_cluster.md) for more detailed information
+* `names`: an array of `google_bigtableadmin_cluster` name
+* `locations`: an array of `google_bigtableadmin_cluster` location
+* `states`: an array of `google_bigtableadmin_cluster` state
+* `serve_nodes`: an array of `google_bigtableadmin_cluster` serve_nodes
+* `cluster_configs`: an array of `google_bigtableadmin_cluster` cluster_config
+* `default_storage_types`: an array of `google_bigtableadmin_cluster` default_storage_type
+* `encryption_configs`: an array of `google_bigtableadmin_cluster` encryption_config
+## Properties
+Properties that can be accessed from the `google_bigtableadmin_clusters` resource:
+
+See [google_bigtableadmin_cluster.md](google_bigtableadmin_cluster.md) for more detailed information
+* `names`: an array of `google_bigtableadmin_cluster` name
+* `locations`: an array of `google_bigtableadmin_cluster` location
+* `states`: an array of `google_bigtableadmin_cluster` state
+* `serve_nodes`: an array of `google_bigtableadmin_cluster` serve_nodes
+* `cluster_configs`: an array of `google_bigtableadmin_cluster` cluster_config
+* `default_storage_types`: an array of `google_bigtableadmin_cluster` default_storage_type
+* `encryption_configs`: an array of `google_bigtableadmin_cluster` encryption_config
+
+## Filter Criteria
+This resource supports all of the above properties as filter criteria, which can be used
+with `where` as a block or a method.
+
+## GCP Permissions
+
+Ensure the [https://bigtableadmin.googleapis.com/](https://console.cloud.google.com/apis/library/bigtableadmin.googleapis.com/) is enabled for the current project.
diff --git a/docs/resources/google_bigtableadmin_project_instance_clusters.md b/docs/resources/google_bigtableadmin_project_instance_clusters.md
deleted file mode 100644
index 68d8d20f..00000000
--- a/docs/resources/google_bigtableadmin_project_instance_clusters.md
+++ /dev/null
@@ -1,60 +0,0 @@
-+++
-
-title = "google_bigtableadmin_project_instance_clusters Resource"
-platform = "gcp"
-draft = false
-gh_repo = "inspec-gcp"
-
-
-[menu.inspec]
-
-title = "google_bigtableadmin_project_instance_clusters"
-identifier = "inspec/resources/gcp/google_bigtableadmin_project_instance_clusters Resource"
-parent = "inspec/resources/gcp"
-+++
-
-Use the `google_bigtableadmin_project_instance_clusters` InSpec audit resource to test the properties of a test a Google ProjectInstanceCluster.
-
-## Installation
-{{% inspec_gcp_install %}}
-
-## Syntax
-A `google_bigtableadmin_project_instance_clusters` is used to test a Google ProjectInstanceCluster resource
-
-## Examples
-```
-    describe google_bigtableadmin_project_instance_clusters(parent: ' value_parent') do
-    it { should exist }
-  end
-```
-
-## Parameters
-Properties that can be accessed from the `google_bigtableadmin_project_instance_clusters` resource:
-
-See [google_bigtableadmin_project_instance_cluster.md](google_bigtableadmin_project_instance_cluster.md) for more detailed information
-* `names`: an array of `google_bigtableadmin_project_instance_cluster` name
-* `locations`: an array of `google_bigtableadmin_project_instance_cluster` location
-* `states`: an array of `google_bigtableadmin_project_instance_cluster` state
-* `serve_nodes`: an array of `google_bigtableadmin_project_instance_cluster` serve_nodes
-* `cluster_configs`: an array of `google_bigtableadmin_project_instance_cluster` cluster_config
-* `default_storage_types`: an array of `google_bigtableadmin_project_instance_cluster` default_storage_type
-* `encryption_configs`: an array of `google_bigtableadmin_project_instance_cluster` encryption_config
-## Properties
-Properties that can be accessed from the `google_bigtableadmin_project_instance_clusters` resource:
-
-See [google_bigtableadmin_project_instance_cluster.md](google_bigtableadmin_project_instance_cluster.md) for more detailed information
-* `names`: an array of `google_bigtableadmin_project_instance_cluster` name
-* `locations`: an array of `google_bigtableadmin_project_instance_cluster` location
-* `states`: an array of `google_bigtableadmin_project_instance_cluster` state
-* `serve_nodes`: an array of `google_bigtableadmin_project_instance_cluster` serve_nodes
-* `cluster_configs`: an array of `google_bigtableadmin_project_instance_cluster` cluster_config
-* `default_storage_types`: an array of `google_bigtableadmin_project_instance_cluster` default_storage_type
-* `encryption_configs`: an array of `google_bigtableadmin_project_instance_cluster` encryption_config
-
-## Filter Criteria
-This resource supports all of the above properties as filter criteria, which can be used
-with `where` as a block or a method.
-
-## GCP Permissions
-
-Ensure the [https://bigtableadmin.googleapis.com/](https://console.cloud.google.com/apis/library/bigtableadmin.googleapis.com/) is enabled for the current project.
diff --git a/libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config.rb b/libraries/google/bigtableadmin/property/cluster_cluster_config.rb
similarity index 62%
rename from libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config.rb
rename to libraries/google/bigtableadmin/property/cluster_cluster_config.rb
index a8650ae5..86ea87a4 100644
--- a/libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config.rb
+++ b/libraries/google/bigtableadmin/property/cluster_cluster_config.rb
@@ -13,23 +13,23 @@
 #     CONTRIBUTING.md located at the root of this package.
 #
 # ----------------------------------------------------------------------------
-require 'google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config'
-require 'google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_limits'
-require 'google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_targets'
+require 'google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config'
+require 'google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_limits'
+require 'google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_targets'
 module GoogleInSpec
   module Bigtableadmin
     module Property
-      class ProjectInstanceClusterClusterConfig
+      class ClusterClusterConfig
         attr_reader :cluster_autoscaling_config
 
         def initialize(args = nil, parent_identifier = nil)
           return if args.nil?
           @parent_identifier = parent_identifier
-          @cluster_autoscaling_config = GoogleInSpec::Bigtableadmin::Property::ProjectInstanceClusterClusterConfigClusterAutoscalingConfig.new(args['clusterAutoscalingConfig'], to_s)
+          @cluster_autoscaling_config = GoogleInSpec::Bigtableadmin::Property::ClusterClusterConfigClusterAutoscalingConfig.new(args['clusterAutoscalingConfig'], to_s)
         end
 
         def to_s
-          "#{@parent_identifier} ProjectInstanceClusterClusterConfig"
+          "#{@parent_identifier} ClusterClusterConfig"
         end
       end
     end
diff --git a/libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config.rb b/libraries/google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config.rb
similarity index 62%
rename from libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config.rb
rename to libraries/google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config.rb
index a9c9b147..228cd84b 100644
--- a/libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config.rb
+++ b/libraries/google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config.rb
@@ -13,12 +13,12 @@
 #     CONTRIBUTING.md located at the root of this package.
 #
 # ----------------------------------------------------------------------------
-require 'google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_limits'
-require 'google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_targets'
+require 'google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_limits'
+require 'google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_targets'
 module GoogleInSpec
   module Bigtableadmin
     module Property
-      class ProjectInstanceClusterClusterConfigClusterAutoscalingConfig
+      class ClusterClusterConfigClusterAutoscalingConfig
         attr_reader :autoscaling_limits
 
         attr_reader :autoscaling_targets
@@ -26,12 +26,12 @@ class ProjectInstanceClusterClusterConfigClusterAutoscalingConfig
         def initialize(args = nil, parent_identifier = nil)
           return if args.nil?
           @parent_identifier = parent_identifier
-          @autoscaling_limits = GoogleInSpec::Bigtableadmin::Property::ProjectInstanceClusterClusterConfigClusterAutoscalingConfigAutoscalingLimits.new(args['autoscalingLimits'], to_s)
-          @autoscaling_targets = GoogleInSpec::Bigtableadmin::Property::ProjectInstanceClusterClusterConfigClusterAutoscalingConfigAutoscalingTargets.new(args['autoscalingTargets'], to_s)
+          @autoscaling_limits = GoogleInSpec::Bigtableadmin::Property::ClusterClusterConfigClusterAutoscalingConfigAutoscalingLimits.new(args['autoscalingLimits'], to_s)
+          @autoscaling_targets = GoogleInSpec::Bigtableadmin::Property::ClusterClusterConfigClusterAutoscalingConfigAutoscalingTargets.new(args['autoscalingTargets'], to_s)
         end
 
         def to_s
-          "#{@parent_identifier} ProjectInstanceClusterClusterConfigClusterAutoscalingConfig"
+          "#{@parent_identifier} ClusterClusterConfigClusterAutoscalingConfig"
         end
       end
     end
diff --git a/libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_limits.rb b/libraries/google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_limits.rb
similarity index 84%
rename from libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_limits.rb
rename to libraries/google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_limits.rb
index d52ab19a..08b51d50 100644
--- a/libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_limits.rb
+++ b/libraries/google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_limits.rb
@@ -16,7 +16,7 @@
 module GoogleInSpec
   module Bigtableadmin
     module Property
-      class ProjectInstanceClusterClusterConfigClusterAutoscalingConfigAutoscalingLimits
+      class ClusterClusterConfigClusterAutoscalingConfigAutoscalingLimits
         attr_reader :min_serve_nodes
 
         attr_reader :max_serve_nodes
@@ -29,7 +29,7 @@ def initialize(args = nil, parent_identifier = nil)
         end
 
         def to_s
-          "#{@parent_identifier} ProjectInstanceClusterClusterConfigClusterAutoscalingConfigAutoscalingLimits"
+          "#{@parent_identifier} ClusterClusterConfigClusterAutoscalingConfigAutoscalingLimits"
         end
       end
     end
diff --git a/libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_targets.rb b/libraries/google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_targets.rb
similarity index 84%
rename from libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_targets.rb
rename to libraries/google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_targets.rb
index cc30439b..0a6bf130 100644
--- a/libraries/google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_targets.rb
+++ b/libraries/google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_targets.rb
@@ -16,7 +16,7 @@
 module GoogleInSpec
   module Bigtableadmin
     module Property
-      class ProjectInstanceClusterClusterConfigClusterAutoscalingConfigAutoscalingTargets
+      class ClusterClusterConfigClusterAutoscalingConfigAutoscalingTargets
         attr_reader :cpu_utilization_percent
 
         attr_reader :storage_utilization_gib_per_node
@@ -29,7 +29,7 @@ def initialize(args = nil, parent_identifier = nil)
         end
 
         def to_s
-          "#{@parent_identifier} ProjectInstanceClusterClusterConfigClusterAutoscalingConfigAutoscalingTargets"
+          "#{@parent_identifier} ClusterClusterConfigClusterAutoscalingConfigAutoscalingTargets"
         end
       end
     end
diff --git a/libraries/google/bigtableadmin/property/projectinstancecluster_encryption_config.rb b/libraries/google/bigtableadmin/property/cluster_encryption_config.rb
similarity index 88%
rename from libraries/google/bigtableadmin/property/projectinstancecluster_encryption_config.rb
rename to libraries/google/bigtableadmin/property/cluster_encryption_config.rb
index 5e66a1dc..20e7aca9 100644
--- a/libraries/google/bigtableadmin/property/projectinstancecluster_encryption_config.rb
+++ b/libraries/google/bigtableadmin/property/cluster_encryption_config.rb
@@ -16,7 +16,7 @@
 module GoogleInSpec
   module Bigtableadmin
     module Property
-      class ProjectInstanceClusterEncryptionConfig
+      class ClusterEncryptionConfig
         attr_reader :kms_key_name
 
         def initialize(args = nil, parent_identifier = nil)
@@ -26,7 +26,7 @@ def initialize(args = nil, parent_identifier = nil)
         end
 
         def to_s
-          "#{@parent_identifier} ProjectInstanceClusterEncryptionConfig"
+          "#{@parent_identifier} ClusterEncryptionConfig"
         end
       end
     end
diff --git a/libraries/google_bigtableadmin_project_instance_cluster.rb b/libraries/google_bigtableadmin_cluster.rb
similarity index 65%
rename from libraries/google_bigtableadmin_project_instance_cluster.rb
rename to libraries/google_bigtableadmin_cluster.rb
index 796bccc1..68022d79 100644
--- a/libraries/google_bigtableadmin_project_instance_cluster.rb
+++ b/libraries/google_bigtableadmin_cluster.rb
@@ -14,15 +14,15 @@
 #
 # ----------------------------------------------------------------------------
 require 'gcp_backend'
-require 'google/bigtableadmin/property/projectinstancecluster_cluster_config'
-require 'google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config'
-require 'google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_limits'
-require 'google/bigtableadmin/property/projectinstancecluster_cluster_config_cluster_autoscaling_config_autoscaling_targets'
-require 'google/bigtableadmin/property/projectinstancecluster_encryption_config'
+require 'google/bigtableadmin/property/cluster_cluster_config'
+require 'google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config'
+require 'google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_limits'
+require 'google/bigtableadmin/property/cluster_cluster_config_cluster_autoscaling_config_autoscaling_targets'
+require 'google/bigtableadmin/property/cluster_encryption_config'
 
 # A provider to manage bigtableadmin resources.
 class BigtableadminProjectInstanceCluster < GcpResourceBase
-  name 'google_bigtableadmin_project_instance_cluster'
+  name 'google_bigtableadmin_cluster'
   desc 'ProjectInstanceCluster'
   supports platform: 'gcp'
 
@@ -47,9 +47,9 @@ def parse
     @location = @fetched['location']
     @state = @fetched['state']
     @serve_nodes = @fetched['serveNodes']
-    @cluster_config = GoogleInSpec::Bigtableadmin::Property::ProjectInstanceClusterClusterConfig.new(@fetched['clusterConfig'], to_s)
+    @cluster_config = GoogleInSpec::Bigtableadmin::Property::ClusterClusterConfig.new(@fetched['clusterConfig'], to_s)
     @default_storage_type = @fetched['defaultStorageType']
-    @encryption_config = GoogleInSpec::Bigtableadmin::Property::ProjectInstanceClusterEncryptionConfig.new(@fetched['encryptionConfig'], to_s)
+    @encryption_config = GoogleInSpec::Bigtableadmin::Property::ClusterEncryptionConfig.new(@fetched['encryptionConfig'], to_s)
   end
 
   def exists?
@@ -57,16 +57,16 @@ def exists?
   end
 
   def to_s
-    "ProjectInstanceCluster #{@params[:]}"
+    "ProjectInstanceCluster #{@params[:name]}"
   end
 
   private
 
   def product_url(_ = nil)
-    'https://bigtableadmin.googleapis.com//v2/'
+    'https://bigtableadmin.googleapis.com/v2/'
   end
 
   def resource_base_url
-    '{{+name}}'
+    '{{name}}'
   end
 end
diff --git a/libraries/google_bigtableadmin_project_instance_clusters.rb b/libraries/google_bigtableadmin_clusters.rb
similarity index 87%
rename from libraries/google_bigtableadmin_project_instance_clusters.rb
rename to libraries/google_bigtableadmin_clusters.rb
index d69765c9..ed8adeec 100644
--- a/libraries/google_bigtableadmin_project_instance_clusters.rb
+++ b/libraries/google_bigtableadmin_clusters.rb
@@ -15,7 +15,7 @@
 # ----------------------------------------------------------------------------
 require 'gcp_backend'
 class BigtableadminProjectInstanceClusters < GcpResourceBase
-  name 'google_bigtableadmin_project_instance_clusters'
+  name 'google_bigtableadmin_clusters'
   desc 'ProjectInstanceCluster plural resource'
   supports platform: 'gcp'
 
@@ -36,7 +36,7 @@ class BigtableadminProjectInstanceClusters < GcpResourceBase
   def initialize(params = {})
     super(params.merge({ use_http_transport: true }))
     @params = params
-    @table = fetch_wrapped_resource('projectInstanceClusters')
+    @table = fetch_wrapped_resource('clusters')
   end
 
   def fetch_wrapped_resource(wrap_path)
@@ -73,19 +73,19 @@ def transformers
       'location' => ->(obj) { [:location, obj['location']] },
       'state' => ->(obj) { [:state, obj['state']] },
       'serveNodes' => ->(obj) { [:serve_nodes, obj['serveNodes']] },
-      'clusterConfig' => ->(obj) { [:cluster_config, GoogleInSpec::Bigtableadmin::Property::ProjectInstanceClusterClusterConfig.new(obj['clusterConfig'], to_s)] },
+      'clusterConfig' => ->(obj) { [:cluster_config, GoogleInSpec::Bigtableadmin::Property::ClusterClusterConfig.new(obj['clusterConfig'], to_s)] },
       'defaultStorageType' => ->(obj) { [:default_storage_type, obj['defaultStorageType']] },
-      'encryptionConfig' => ->(obj) { [:encryption_config, GoogleInSpec::Bigtableadmin::Property::ProjectInstanceClusterEncryptionConfig.new(obj['encryptionConfig'], to_s)] },
+      'encryptionConfig' => ->(obj) { [:encryption_config, GoogleInSpec::Bigtableadmin::Property::ClusterEncryptionConfig.new(obj['encryptionConfig'], to_s)] },
     }
   end
 
   private
 
   def product_url(_ = nil)
-    'https://bigtableadmin.googleapis.com//v2/'
+    'https://bigtableadmin.googleapis.com/v2/'
   end
 
   def resource_base_url
-    '{{+parent}}/clusters'
+    '{{parent}}/clusters'
   end
 end
diff --git a/test/integration/verify/controls/google_bigtableadmin_cluster.rb b/test/integration/verify/controls/google_bigtableadmin_cluster.rb
new file mode 100644
index 00000000..9f9b8771
--- /dev/null
+++ b/test/integration/verify/controls/google_bigtableadmin_cluster.rb
@@ -0,0 +1,42 @@
+# ----------------------------------------------------------------------------
+#
+#     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
+#
+# ----------------------------------------------------------------------------
+#
+#     This file is automatically generated by Magic Modules and manual
+#     changes will be clobbered when the file is regenerated.
+#
+#     Please read more about how to change this file in README.md and
+#     CONTRIBUTING.md located at the root of this package.
+#
+# ----------------------------------------------------------------------------
+
+title 'Test GCP google_bigtableadmin_cluster resource.'
+
+gcp_project_id = input(:gcp_project_id, value: 'gcp_project_id', description: 'The GCP project identifier.')
+
+  cluster = input('cluster', value: {
+  "name": "projects/ppradhan/instances/inspec-test/clusters/inspec-test-c1",
+  "parent": "projects/ppradhan/instances/inspec-test",
+  "location": "projects/ppradhan/locations/us-central1-f",
+  "state": "READY",
+  "default_storage_type": "SSD"
+}, description: 'cluster description')
+control 'google_bigtableadmin_cluster-1.0' do
+  impact 1.0
+  title 'google_bigtableadmin_cluster resource test'
+
+  describe google_bigtableadmin_cluster(name: cluster['name']) do
+  	it { should exist }
+  	its('name') { should cmp cluster['name'] }
+  	its('location') { should cmp cluster['location'] }
+  	its('state') { should cmp cluster['state'] }
+  	its('default_storage_type') { should cmp cluster['default_storage_type'] }
+
+  end
+
+  describe google_bigtableadmin_cluster(name: "does_not_exit") do
+  	it { should_not exist }
+  end
+end
diff --git a/test/integration/verify/controls/google_bigtableadmin_clusters.rb b/test/integration/verify/controls/google_bigtableadmin_clusters.rb
new file mode 100644
index 00000000..fa5199ee
--- /dev/null
+++ b/test/integration/verify/controls/google_bigtableadmin_clusters.rb
@@ -0,0 +1,37 @@
+# ----------------------------------------------------------------------------
+#
+#     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
+#
+# ----------------------------------------------------------------------------
+#
+#     This file is automatically generated by Magic Modules and manual
+#     changes will be clobbered when the file is regenerated.
+#
+#     Please read more about how to change this file in README.md and
+#     CONTRIBUTING.md located at the root of this package.
+#
+# ----------------------------------------------------------------------------
+
+title 'Test GCP google_bigtableadmin_clusters resource.'
+
+gcp_project_id = input(:gcp_project_id, value: 'gcp_project_id', description: 'The GCP project identifier.')
+
+  cluster = input('cluster', value: {
+  "name": "projects/ppradhan/instances/inspec-test/clusters/inspec-test-c1",
+  "parent": "projects/ppradhan/instances/inspec-test",
+  "location": "projects/ppradhan/locations/us-central1-f",
+  "state": "READY",
+  "default_storage_type": "SSD"
+}, description: 'cluster description')
+control 'google_bigtableadmin_clusters-1.0' do
+  impact 1.0
+  title 'google_bigtableadmin_clusters resource test'
+
+    describe google_bigtableadmin_clusters(parent: cluster['parent']) do
+      it { should exist }
+      its('names') { should include cluster['name'] }
+      its('locations') { should include cluster['location'] }
+      its('states') { should include cluster['state'] }
+      its('default_storage_types') { should include cluster['default_storage_type'] }
+    end
+end
diff --git a/test/integration/verify/controls/google_bigtableadmin_project_instance_cluster.rb b/test/integration/verify/controls/google_bigtableadmin_project_instance_cluster.rb
deleted file mode 100644
index 481d5557..00000000
--- a/test/integration/verify/controls/google_bigtableadmin_project_instance_cluster.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# ----------------------------------------------------------------------------
-#
-#     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
-#
-# ----------------------------------------------------------------------------
-#
-#     This file is automatically generated by Magic Modules and manual
-#     changes will be clobbered when the file is regenerated.
-#
-#     Please read more about how to change this file in README.md and
-#     CONTRIBUTING.md located at the root of this package.
-#
-# ----------------------------------------------------------------------------
-
-title 'Test GCP google_bigtableadmin_project_instance_cluster resource.'
-
-gcp_project_id = input(:gcp_project_id, value: 'gcp_project_id', description: 'The GCP project identifier.')
-
-  project_instance_cluster = input('project_instance_cluster', value: {
-  "name": "value_name",
-  "parent": "value_parent",
-  "location": "value_location",
-  "state": "value_state",
-  "default_storage_type": "value_defaultstoragetype"
-}, description: 'project_instance_cluster description')
-control 'google_bigtableadmin_project_instance_cluster-1.0' do
-  impact 1.0
-  title 'google_bigtableadmin_project_instance_cluster resource test'
-
-  describe google_bigtableadmin_project_instance_cluster(name: project_instance_cluster['name']) do
-  	it { should exist }
-  	its('name') { should cmp project_instance_cluster['name'] }
-  	its('location') { should cmp project_instance_cluster['location'] }
-  	its('state') { should cmp project_instance_cluster['state'] }
-  	its('default_storage_type') { should cmp project_instance_cluster['default_storage_type'] }
-
-  end
-
-  describe google_bigtableadmin_project_instance_cluster(name: "does_not_exit") do
-  	it { should_not exist }
-  end
-end
diff --git a/test/integration/verify/controls/google_bigtableadmin_project_instance_clusters.rb b/test/integration/verify/controls/google_bigtableadmin_project_instance_clusters.rb
deleted file mode 100644
index 1a84dcb6..00000000
--- a/test/integration/verify/controls/google_bigtableadmin_project_instance_clusters.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-# ----------------------------------------------------------------------------
-#
-#     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
-#
-# ----------------------------------------------------------------------------
-#
-#     This file is automatically generated by Magic Modules and manual
-#     changes will be clobbered when the file is regenerated.
-#
-#     Please read more about how to change this file in README.md and
-#     CONTRIBUTING.md located at the root of this package.
-#
-# ----------------------------------------------------------------------------
-
-title 'Test GCP google_bigtableadmin_project_instance_clusters resource.'
-
-gcp_project_id = input(:gcp_project_id, value: 'gcp_project_id', description: 'The GCP project identifier.')
-
-  project_instance_cluster = input('project_instance_cluster', value: {
-  "name": "value_name",
-  "parent": "value_parent",
-  "location": "value_location",
-  "state": "value_state",
-  "default_storage_type": "value_defaultstoragetype"
-}, description: 'project_instance_cluster description')
-control 'google_bigtableadmin_project_instance_clusters-1.0' do
-  impact 1.0
-  title 'google_bigtableadmin_project_instance_clusters resource test'
-
-      describe google_bigtableadmin_project_instance_clusters(parent: project_instance_cluster['parent']) do
-      it { should exist }
-    end
-end