chef-provisioning-aws 3.0.4 → 3.0.6

data/lib/chef/provider/aws_server_certificate.rb

@@ -1,18 +1,19 @@
-require 'chef/provisioning/aws_driver/aws_provider'
+require "chef/provisioning/aws_driver/aws_provider"
 
 class Chef::Provider::AwsServerCertificate < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_server_certificate
 
-  def update_aws_object(certificate)
+  def update_aws_object(_certificate)
     Chef::Log.warn("aws_server_certificate does not support modifying an existing certificate")
   end
 
   def create_aws_object
     converge_by "create server certificate #{new_resource.name}" do
       opts = {
-        :server_certificate_name => new_resource.name,
-        :certificate_body => new_resource.certificate_body,
-        :private_key => new_resource.private_key      }
+        server_certificate_name: new_resource.name,
+        certificate_body: new_resource.certificate_body,
+        private_key: new_resource.private_key
+      }
       opts[:certificate_chain] = new_resource.certificate_chain if new_resource.certificate_chain
       new_resource.driver.iam.upload_server_certificate(**opts)
     end

data/lib/chef/provider/aws_sns_topic.rb

@@ -1,9 +1,9 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'date'
+require "chef/provisioning/aws_driver/aws_provider"
+require "date"
 
 class Chef::Provider::AwsSnsTopic < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_sns_topic
-  
+
   protected
 
   def create_aws_object
@@ -12,8 +12,7 @@ class Chef::Provider::AwsSnsTopic < Chef::Provisioning::AWSDriver::AWSProvider
     end
   end
 
-  def update_aws_object(topic)
-  end
+  def update_aws_object(topic); end
 
   def destroy_aws_object(topic)
     topic_arn_name = topic.attributes.values_at("TopicArn").first
@@ -21,5 +20,4 @@ class Chef::Provider::AwsSnsTopic < Chef::Provisioning::AWSDriver::AWSProvider
       new_resource.driver.sns.delete_topic(topic_arn: topic_arn_name)
     end
   end
-
 end

data/lib/chef/provider/aws_sqs_queue.rb

@@ -1,8 +1,8 @@
-require 'chef/provisioning/aws_driver/aws_provider'
+require "chef/provisioning/aws_driver/aws_provider"
 
 class Chef::Provider::AwsSqsQueue < Chef::Provisioning::AWSDriver::AWSProvider
   provides :aws_sqs_queue
-  
+
   def create_aws_object
     options = AWSResource.lookup_options(new_resource.options || {}, resource: new_resource)
     option_sqs = {}
@@ -15,8 +15,7 @@ class Chef::Provider::AwsSqsQueue < Chef::Provisioning::AWSDriver::AWSProvider
     end
   end
 
-  def update_aws_object(queue)
-  end
+  def update_aws_object(queue); end
 
   def destroy_aws_object(queue)
     converge_by "delete SQS queue #{new_resource.name} in #{region}" do

data/lib/chef/provider/aws_subnet.rb

@@ -1,7 +1,7 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'chef/provisioning/aws_driver/aws_resource'
-require 'date'
-require 'chef/resource/aws_vpc'
+require "chef/provisioning/aws_driver/aws_provider"
+require "chef/provisioning/aws_driver/aws_resource"
+require "date"
+require "chef/resource/aws_vpc"
 
 class Chef::Provider::AwsSubnet < Chef::Provisioning::AWSDriver::AWSProvider
   include Chef::Provisioning::AWSDriver::TaggingStrategy::EC2ConvergeTags
@@ -11,13 +11,11 @@ class Chef::Provider::AwsSubnet < Chef::Provisioning::AWSDriver::AWSProvider
   def action_create
     subnet = super
 
-    if new_resource.map_public_ip_on_launch != nil
+    unless new_resource.map_public_ip_on_launch.nil?
       update_map_public_ip_on_launch(subnet)
     end
 
-    if new_resource.route_table != nil
-      update_route_table(subnet)
-    end
+    update_route_table(subnet) unless new_resource.route_table.nil?
 
     update_network_acl(subnet)
   end
@@ -26,9 +24,7 @@ class Chef::Provider::AwsSubnet < Chef::Provisioning::AWSDriver::AWSProvider
 
   def create_aws_object
     cidr_block = new_resource.cidr_block
-    if !cidr_block
-      cidr_block = Chef::Resource::AwsVpc.get_aws_object(new_resource.vpc, resource: new_resource).cidr_block
-    end
+    cidr_block ||= Chef::Resource::AwsVpc.get_aws_object(new_resource.vpc, resource: new_resource).cidr_block
     options = { vpc_id: new_resource.vpc, cidr_block: cidr_block }
     options[:availability_zone] = new_resource.availability_zone if new_resource.availability_zone
     options = Chef::Provisioning::AWSDriver::AWSResource.lookup_options(options, resource: new_resource)
@@ -36,8 +32,8 @@ class Chef::Provider::AwsSubnet < Chef::Provisioning::AWSDriver::AWSProvider
     converge_by "create subnet #{new_resource.name} with CIDR #{cidr_block} in VPC #{new_resource.vpc} (#{options[:vpc_id]}) in #{region}" do
       subnet = new_resource.driver.ec2_resource.create_subnet(options)
       retry_with_backoff(::Aws::EC2::Errors::InvalidSubnetIDNotFound) do
-        new_resource.driver.ec2_resource.create_tags(resources: [subnet.id],tags: [{key: "Name", value: new_resource.name}])
-        new_resource.driver.ec2_resource.create_tags(resources: [subnet.id],tags: [{key: "VPC", value: new_resource.vpc}])
+        new_resource.driver.ec2_resource.create_tags(resources: [subnet.id], tags: [{ key: "Name", value: new_resource.name }])
+        new_resource.driver.ec2_resource.create_tags(resources: [subnet.id], tags: [{ key: "VPC", value: new_resource.vpc }])
       end
       subnet
     end
@@ -59,10 +55,10 @@ class Chef::Provider::AwsSubnet < Chef::Provisioning::AWSDriver::AWSProvider
 
   def destroy_aws_object(subnet)
     if purging
-      # TODO possibly convert to http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Client.html#terminate_instances-instance_method
+      # TODO: possibly convert to http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Client.html#terminate_instances-instance_method
       p = Chef::ChefFS::Parallelizer.new(5)
-      current_driver = self.new_resource.driver
-      current_chef_server = self.new_resource.chef_server
+      current_driver = new_resource.driver
+      current_chef_server = new_resource.chef_server
       p.parallel_do(subnet.instances.to_a) do |instance|
         Cheffish.inline_resource(self, action) do
           aws_instance instance.id do
@@ -87,7 +83,7 @@ class Chef::Provider::AwsSubnet < Chef::Provisioning::AWSDriver::AWSProvider
         end
       end
     end
-    converge_by "delete #{new_resource.to_s} in VPC #{new_resource.vpc} in #{region}" do
+    converge_by "delete #{new_resource} in VPC #{new_resource.vpc} in #{region}" do
       # If the subnet doesn't exist we can't check state on it - state can only be :pending or :available
       begin
         subnet.delete
@@ -99,10 +95,10 @@ class Chef::Provider::AwsSubnet < Chef::Provisioning::AWSDriver::AWSProvider
   private
 
   def update_map_public_ip_on_launch(subnet)
-    if !new_resource.map_public_ip_on_launch.nil?
-      subnet_desc = subnet.client.describe_subnets(subnet_ids: [ subnet.id ])[:subnets].first
+    unless new_resource.map_public_ip_on_launch.nil?
+      subnet_desc = subnet.client.describe_subnets(subnet_ids: [subnet.id])[:subnets].first
       if new_resource.map_public_ip_on_launch
-        if !subnet_desc[:map_public_ip_on_launch]
+        unless subnet_desc[:map_public_ip_on_launch]
           converge_by "turn on automatic public IPs for subnet #{subnet.id}" do
             subnet.client.modify_subnet_attribute(subnet_id: subnet.id, map_public_ip_on_launch: { value: true })
           end
@@ -118,28 +114,27 @@ class Chef::Provider::AwsSubnet < Chef::Provisioning::AWSDriver::AWSProvider
   end
 
   def update_route_table(subnet)
-    current_route_table_association = subnet.client.describe_route_tables(filters: [{name: "vpc-id", values: [subnet.vpc.id]}]).route_tables
+    current_route_table_association = subnet.client.describe_route_tables(filters: [{ name: "vpc-id", values: [subnet.vpc.id] }]).route_tables
     route_table_entry = nil
     do_break = false
-    # Below snippet gives the entry of route_table who is associated with current subnet either by matching its 
+    # Below snippet gives the entry of route_table who is associated with current subnet either by matching its
     # subnet_id or with a default subnet (i.e by checking association.main == true & in that case
     # association.subnet_id is nil)
     current_route_table_association.each do |route_tbl|
-      if !route_tbl.associations.empty?
-        route_tbl.associations.each do |r|
-          if r.subnet_id == subnet.id
-            route_table_entry = r
-            do_break = true
-            break
-          elsif r.subnet_id.nil? && r.main == true
-            route_table_entry = r
-          end
+      next if route_tbl.associations.empty?
+      route_tbl.associations.each do |r|
+        if r.subnet_id == subnet.id
+          route_table_entry = r
+          do_break = true
+          break
+        elsif r.subnet_id.nil? && r.main == true
+          route_table_entry = r
         end
-        break if do_break
       end
+      break if do_break
     end
     if new_resource.route_table == :default_to_main
-      if !route_table_entry.main
+      unless route_table_entry.main
         converge_by "reset route table of subnet #{new_resource.name} to the VPC default" do
           subnet.client.disassociate_route_table(association_id: route_table_entry.route_table_association_id)
         end
@@ -168,7 +163,7 @@ class Chef::Provider::AwsSubnet < Chef::Provisioning::AWSDriver::AWSProvider
       network_acl_id =
         AWSResource.lookup_options({ network_acl: new_resource.network_acl }, resource: new_resource)[:network_acl]
       # Below snippet gives the entry of network_acl who is associated with current subnet by matching its subnet_id
-      network_acl_association = subnet.client.describe_network_acls(filters: [{name: "vpc-id", values: [subnet.vpc.id]}, {name: "association.subnet-id", values: [subnet.id]}]).network_acls.first.associations
+      network_acl_association = subnet.client.describe_network_acls(filters: [{ name: "vpc-id", values: [subnet.vpc.id] }, { name: "association.subnet-id", values: [subnet.id] }]).network_acls.first.associations
       current_network_acl_association = network_acl_association.find { |r| r.subnet_id == subnet.id } unless network_acl_association.empty?
 
       if current_network_acl_association.network_acl_id != network_acl_id && !current_network_acl_association.nil?

data/lib/chef/provider/aws_vpc.rb

@@ -1,7 +1,7 @@
-require 'chef/provisioning/aws_driver/aws_provider'
-require 'date'
-require 'chef/provisioning'
-require 'retryable'
+require "chef/provisioning/aws_driver/aws_provider"
+require "date"
+require "chef/provisioning"
+require "retryable"
 
 class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
   include Chef::Provisioning::AWSDriver::TaggingStrategy::EC2ConvergeTags
@@ -19,24 +19,18 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
     #
     # Attach/detach internet gateway
     #
-    if !new_resource.internet_gateway.nil?
-      update_internet_gateway(vpc)
-    end
+    update_internet_gateway(vpc) unless new_resource.internet_gateway.nil?
 
     # Replace the main route table for the VPC
-    if !new_resource.main_route_table.nil?
-      update_main_route_table(vpc)
-    end
+    update_main_route_table(vpc) unless new_resource.main_route_table.nil?
 
     # Update the main route table
-    if !new_resource.main_routes.nil?
+    unless new_resource.main_routes.nil?
       update_main_routes(vpc, new_resource.main_route_table)
     end
 
     # Update DHCP options
-    if !new_resource.dhcp_options.nil?
-      update_dhcp_options(vpc)
-    end
+    update_dhcp_options(vpc) unless new_resource.dhcp_options.nil?
   end
 
   protected
@@ -48,7 +42,7 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
 
     converge_by "create VPC #{new_resource.name} in #{region}" do
       ec2_resource = ::Aws::EC2::Resource.new(new_resource.driver.ec2)
-      vpc = ec2_resource.create_vpc({ cidr_block: new_resource.cidr_block, instance_tenancy: options[:instance_tenancy] })
+      vpc = ec2_resource.create_vpc(cidr_block: new_resource.cidr_block, instance_tenancy: options[:instance_tenancy])
       wait_for_state(vpc, [:available])
       retry_with_backoff(::Aws::EC2::Errors::InvalidVpcIDNotFound) do
         ec2_resource.create_tags(resources: [vpc.vpc_id], tags: [{ key: "Name", value: new_resource.name }])
@@ -67,16 +61,16 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
   end
 
   def destroy_aws_object(vpc)
-    current_driver = self.new_resource.driver
-    current_chef_server = self.new_resource.chef_server
+    current_driver = new_resource.driver
+    current_chef_server = new_resource.chef_server
     if purging
-      #SDK V2
-      nat_gateways = new_resource.driver.ec2_client.describe_nat_gateways({
-          :filter => [
-              { name: "vpc-id", values: [vpc.id] },
-              { name: "state", values: ["available", "pending"] },
-          ]
-      }).nat_gateways
+      # SDK V2
+      nat_gateways = new_resource.driver.ec2_client.describe_nat_gateways(
+        filter: [
+          { name: "vpc-id", values: [vpc.id] },
+          { name: "state", values: %w{available pending} }
+        ]
+      ).nat_gateways
 
       nat_gateways.each do |nat_gw|
         nat_gw_resource = new_resource.driver.ec2_resource.nat_gateway(nat_gw.nat_gateway_id)
@@ -89,7 +83,7 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
         end
       end
 
-      #SDK V1
+      # SDK V1
       vpc.subnets.each do |s|
         Cheffish.inline_resource(self, action) do
           aws_subnet s do
@@ -132,10 +126,10 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
         end
       end
 
-      #SDK V2
+      # SDK V2
       vpc_new_sdk = new_resource.driver.ec2_resource.vpc(vpc.id)
       vpc_new_sdk.route_tables.each do |rt|
-        next if rt.associations.any? { |association| association.main }
+        next if rt.associations.any?(&:main)
         Cheffish.inline_resource(self, action) do
           aws_route_table rt do
             action :purge
@@ -146,18 +140,18 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
       end
 
       vpc_peering_connections = []
-      %w(
+      %w{
         requester-vpc-info.vpc-id
         accepter-vpc-info.vpc-id
-      ).each do |filter|
-        vpc_peering_connections += new_resource.driver.ec2_client.describe_vpc_peering_connections({
-            :filters => [
-                {
-                    :name => filter,
-                    :values => [vpc.id],
-                },
-            ],
-        }).vpc_peering_connections
+      }.each do |filter|
+        vpc_peering_connections += new_resource.driver.ec2_client.describe_vpc_peering_connections(
+          filters: [
+            {
+              name: filter,
+              values: [vpc.id]
+            }
+          ]
+        ).vpc_peering_connections
       end
 
       vpc_peering_connections.each do |pc_type|
@@ -192,7 +186,7 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
 
     # We cannot delete the main route table, and it will be deleted when the VPC is deleted anyways
 
-    converge_by "delete #{new_resource.to_s} in #{region}" do
+    converge_by "delete #{new_resource} in #{region}" do
       vpc.delete
     end
   end
@@ -202,16 +196,15 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
   def update_vpc_attributes(vpc)
     # Figure out what (if anything) we need to update
     update_attributes = {}
-    %w(enable_dns_support enable_dns_hostnames).each do |name|
+    %w{enable_dns_support enable_dns_hostnames}.each do |name|
       desired_value = new_resource.public_send(name)
-      if !desired_value.nil?
-        # enable_dns_support -> enableDnsSupport
-        aws_attr_name = name.gsub(/_./) { |v| v[1..1].upcase }
-        name = name.to_sym
-        actual_value = vpc.client.describe_vpc_attribute(vpc_id: vpc.id, attribute: aws_attr_name)
-        if actual_value[name][:value] != desired_value
-          update_attributes[name] = { old_value: actual_value[name][:value], value: desired_value }
-        end
+      next if desired_value.nil?
+      # enable_dns_support -> enableDnsSupport
+      aws_attr_name = name.gsub(/_./) { |v| v[1..1].upcase }
+      name = name.to_sym
+      actual_value = vpc.client.describe_vpc_attribute(vpc_id: vpc.id, attribute: aws_attr_name)
+      if actual_value[name][:value] != desired_value
+        update_attributes[name] = { old_value: actual_value[name][:value], value: desired_value }
       end
     end
 
@@ -224,70 +217,70 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
 
   def update_internet_gateway(vpc)
     current_ig = vpc.internet_gateways.first
-    current_driver = self.new_resource.driver
-    current_chef_server = self.new_resource.chef_server
+    current_driver = new_resource.driver
+    current_chef_server = new_resource.chef_server
     case new_resource.internet_gateway
-      when String, Chef::Resource::AwsInternetGateway, ::Aws::EC2::InternetGateway
-        new_ig = Chef::Resource::AwsInternetGateway.get_aws_object(new_resource.internet_gateway, resource: new_resource)
-        if !current_ig
-          Cheffish.inline_resource(self, action) do
-            aws_internet_gateway new_ig do
-              vpc vpc.id
-              # We have to set the driver & chef server on all resources because
-              # `with_chef_driver(...) do` gets evaluated at compile-time and these
-              # resources aren't constructed until converge-time.  So the driver has
-              # been reset at this point
-              driver current_driver
-              chef_server current_chef_server
-            end
+    when String, Chef::Resource::AwsInternetGateway, ::Aws::EC2::InternetGateway
+      new_ig = Chef::Resource::AwsInternetGateway.get_aws_object(new_resource.internet_gateway, resource: new_resource)
+      if !current_ig
+        Cheffish.inline_resource(self, action) do
+          aws_internet_gateway new_ig do
+            vpc vpc.id
+            # We have to set the driver & chef server on all resources because
+            # `with_chef_driver(...) do` gets evaluated at compile-time and these
+            # resources aren't constructed until converge-time.  So the driver has
+            # been reset at this point
+            driver current_driver
+            chef_server current_chef_server
           end
-        elsif current_ig != new_ig
-          Cheffish.inline_resource(self, action) do
-            aws_internet_gateway current_ig do
-              ig_tag = current_ig.tags.find { |i| i.key == "OwnedByVPC" }
-              ig_vpc = ig_tag.value unless ig_tag.nil?
-              if ig_vpc == vpc.id
-                action :destroy
-              else
-                action :detach
-              end
-              driver current_driver
-              chef_server current_chef_server
-            end
-            aws_internet_gateway new_ig do
-              vpc vpc.id
-              driver current_driver
-              chef_server current_chef_server
+        end
+      elsif current_ig != new_ig
+        Cheffish.inline_resource(self, action) do
+          aws_internet_gateway current_ig do
+            ig_tag = current_ig.tags.find { |i| i.key == "OwnedByVPC" }
+            ig_vpc = ig_tag.value unless ig_tag.nil?
+            if ig_vpc == vpc.id
+              action :destroy
+            else
+              action :detach
             end
+            driver current_driver
+            chef_server current_chef_server
+          end
+          aws_internet_gateway new_ig do
+            vpc vpc.id
+            driver current_driver
+            chef_server current_chef_server
           end
         end
-      when true
-        if !current_ig
-          Cheffish.inline_resource(self, action) do
-            aws_internet_gateway "igw-managed-by-#{vpc.id}" do
-              vpc vpc.id
-              aws_tags 'OwnedByVPC' => vpc.id
-              driver current_driver
-              chef_server current_chef_server
-            end
+      end
+    when true
+      unless current_ig
+        Cheffish.inline_resource(self, action) do
+          aws_internet_gateway "igw-managed-by-#{vpc.id}" do
+            vpc vpc.id
+            aws_tags "OwnedByVPC" => vpc.id
+            driver current_driver
+            chef_server current_chef_server
           end
         end
-      when false
-        if current_ig
-          Cheffish.inline_resource(self, action) do
-            aws_internet_gateway current_ig do
-              ig_tag = current_ig.tags.find { |i| i.key == "OwnedByVPC" }
-              ig_vpc = ig_tag.value unless ig_tag.nil?
-              if ig_vpc == vpc.id
-                action :destroy
-              else
-                action :detach
-              end
-              driver current_driver
-              chef_server current_chef_server
+      end
+    when false
+      if current_ig
+        Cheffish.inline_resource(self, action) do
+          aws_internet_gateway current_ig do
+            ig_tag = current_ig.tags.find { |i| i.key == "OwnedByVPC" }
+            ig_vpc = ig_tag.value unless ig_tag.nil?
+            if ig_vpc == vpc.id
+              action :destroy
+            else
+              action :detach
             end
+            driver current_driver
+            chef_server current_chef_server
           end
         end
+      end
     end
   end
 
@@ -297,22 +290,21 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
     current_route_table = nil
     # Below snippet gives the entry of main_route_table and current_route_table entry who is associated with current vpc.It is an replacement of "vpc.route_tables.main_route_table"
     vpc.route_tables.entries.each do |entry|
-      if !entry.associations.empty?
-        entry.associations.each do |r|
-          if r.main == true
-            main_route_table = r
-          elsif r.main == false
-            current_route_table = r
-          end
+      next if entry.associations.empty?
+      entry.associations.each do |r|
+        if r.main == true
+          main_route_table = r
+        elsif r.main == false
+          current_route_table = r
         end
       end
     end
     current_route_table ||= main_route_table
     if current_route_table.route_table_id != desired_route_table.id
       if main_route_table.nil?
-        raise "No main route table association found for #{new_resource.to_s} current main route table. error!  Probably a race condition."
+        raise "No main route table association found for #{new_resource} current main route table. error!  Probably a race condition."
       end
-      converge_by "change main route table for #{new_resource.to_s} to #{desired_route_table.id} (was #{current_route_table.route_table_id})" do
+      converge_by "change main route table for #{new_resource} to #{desired_route_table.id} (was #{current_route_table.route_table_id})" do
         vpc.client.replace_route_table_association(
           association_id: main_route_table.id,
           route_table_id: desired_route_table.id
@@ -332,8 +324,8 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
       main_route_table = entry.associations.find { |r| r.main == true } unless entry.associations.empty?
     end
     main_routes = new_resource.main_routes
-    current_driver = self.new_resource.driver
-    current_chef_server = self.new_resource.chef_server
+    current_driver = new_resource.driver
+    current_chef_server = new_resource.chef_server
     Cheffish.inline_resource(self, action) do
       aws_route_table main_route_table.route_table_id do
         vpc vpc
@@ -349,11 +341,11 @@ class Chef::Provider::AwsVpc < Chef::Provisioning::AWSDriver::AWSProvider
     dhcp_options = vpc.dhcp_options
     desired_dhcp_options = Chef::Resource::AwsDhcpOptions.get_aws_object(new_resource.dhcp_options, resource: new_resource)
     if dhcp_options.id != desired_dhcp_options.id
-      converge_by "change DHCP options for #{new_resource.to_s} to #{new_resource.dhcp_options} (#{desired_dhcp_options.id}) - was #{dhcp_options.id}" do
-        vpc.associate_dhcp_options({
+      converge_by "change DHCP options for #{new_resource} to #{new_resource.dhcp_options} (#{desired_dhcp_options.id}) - was #{dhcp_options.id}" do
+        vpc.associate_dhcp_options(
           dhcp_options_id: desired_dhcp_options.id, # required
-          dry_run: false,
-        })
+          dry_run: false
+        )
       end
     end
   end