cloud-mu 3.4.0 → 3.5.0

data/modules/mu/providers/aws/alarm.rb

@@ -36,7 +36,7 @@ module MU
                     @dependencies[dimension["depclass"]][dimension["name"]].cloudobj.cloud_id
                   end
                 elsif dimension["mu_name"] and dimension["deploy_id"]
-                  found = MU::MommaCat.findStray("AWS", deps_class, deploy_id: dimension["deploy_id"], mu_name: dimension["mu_name"], region: @config["region"])
+                  found = MU::MommaCat.findStray("AWS", deps_class, deploy_id: dimension["deploy_id"], mu_name: dimension["mu_name"], region: @region)
                   raise MuError, "Couldn't find #{deps_class} #{dimension["mu_name"]}" if found.nil? || found.empty?
                   resp = found.first.deploydata["cloud_id"]
                   resp.downcase if %w{database cache_cluster}.include?(deps_class)
@@ -79,8 +79,8 @@ module MU
             evaluation_periods: @config["evaluation_periods"],
             threshold: @config["threshold"],
             comparison_operator: @config["comparison_operator"],
-            region: @config["region"],
-            credentials: @config['credentials']
+            region: @region,
+            credentials: @credentials
           )
 
           @cloud_id = @mu_name

data/modules/mu/providers/aws/bucket.rb

@@ -39,20 +39,20 @@ module MU
           bucket_name = @deploy.getResourceName(@config["name"], max_length: 63).downcase
 
           MU.log "Creating S3 bucket #{bucket_name}"
-          MU::Cloud::AWS.s3(credentials: @config['credentials'], region: @config['region']).create_bucket(
+          MU::Cloud::AWS.s3(credentials: @credentials, region: @region).create_bucket(
             acl: @config['acl'],
             bucket: bucket_name
           )
 
           @cloud_id = bucket_name
-          is_live = MU::Cloud::AWS::Bucket.find(cloud_id: @cloud_id, region: @config['region'], credentials: @credentials).values.first
+          is_live = MU::Cloud::AWS::Bucket.find(cloud_id: @cloud_id, region: @region, credentials: @credentials).values.first
           begin
-            is_live = MU::Cloud::AWS::Bucket.find(cloud_id: @cloud_id, region: @config['region'], credentials: @credentials).values.first
+            is_live = MU::Cloud::AWS::Bucket.find(cloud_id: @cloud_id, region: @region, credentials: @credentials).values.first
             sleep 3
           end while !is_live
 
           @@region_cache_semaphore.synchronize {
-            @@region_cache[@cloud_id] ||= @config['region']
+            @@region_cache[@cloud_id] ||= @region
           }
 
           tagBucket if !@config['scrub_mu_isms']
@@ -78,7 +78,7 @@ module MU
             }
           end
 
-          MU::Cloud::AWS.s3(credentials: @config['credentials'], region: @config['region']).put_bucket_tagging(
+          MU::Cloud::AWS.s3(credentials: @credentials, region: @region).put_bucket_tagging(
             bucket: @cloud_id,
             tagging: {
               tag_set: tagset
@@ -120,7 +120,7 @@ module MU
         def groom
 
           @@region_cache_semaphore.synchronize {
-            @@region_cache[@cloud_id] ||= @config['region']
+            @@region_cache[@cloud_id] ||= @region
           }
           tagBucket if !@config['scrub_mu_isms']
 
@@ -129,7 +129,7 @@ module MU
 
           if @config['versioning'] and current["versioning"].status != "Enabled"
             MU.log "Enabling versioning on S3 bucket #{@cloud_id}", MU::NOTICE
-            MU::Cloud::AWS.s3(credentials: @config['credentials'], region: @config['region']).put_bucket_versioning(
+            MU::Cloud::AWS.s3(credentials: @credentials, region: @region).put_bucket_versioning(
               bucket: @cloud_id,
               versioning_configuration: {
                 mfa_delete: "Disabled",
@@ -138,7 +138,7 @@ module MU
             )
           elsif !@config['versioning'] and current["versioning"].status == "Enabled"
             MU.log "Suspending versioning on S3 bucket #{@cloud_id}", MU::NOTICE
-            MU::Cloud::AWS.s3(credentials: @config['credentials'], region: @config['region']).put_bucket_versioning(
+            MU::Cloud::AWS.s3(credentials: @credentials, region: @region).put_bucket_versioning(
               bucket: @cloud_id,
               versioning_configuration: {
                 mfa_delete: "Disabled",
@@ -163,14 +163,14 @@ module MU
               end
 
               Hash[upload_me].each_pair { |file, url|
-                self.class.upload(url, file: file, credentials: @credentials, region: @config['region'], acl: batch['acl'])
+                self.class.upload(url, file: file, credentials: @credentials, region: @region, acl: batch['acl'])
               }
             }
           end
 
           if @config['web'] and current["website"].nil?
             MU.log "Enabling web service on S3 bucket #{@cloud_id}", MU::NOTICE
-            MU::Cloud::AWS.s3(credentials: @config['credentials'], region: @config['region']).put_bucket_website(
+            MU::Cloud::AWS.s3(credentials: @credentials, region: @region).put_bucket_website(
               bucket: @cloud_id,
               website_configuration: {
                 error_document: {
@@ -183,13 +183,13 @@ module MU
             )
             ['web_error_object', 'web_index_object'].each { |key|
               begin
-                MU::Cloud::AWS.s3(credentials: @config['credentials'], region: @config['region']).head_object(
+                MU::Cloud::AWS.s3(credentials: @credentials, region: @region).head_object(
                   bucket: @cloud_id,
                   key: @config[key]
                 )
               rescue Aws::S3::Errors::NotFound
                 MU.log "Uploading placeholder #{@config[key]} to bucket #{@cloud_id}"
-                MU::Cloud::AWS.s3(credentials: @config['credentials'], region: @config['region']).put_object(
+                MU::Cloud::AWS.s3(credentials: @credentials, region: @region).put_object(
                   acl: "public-read",
                   bucket: @cloud_id,
                   key: @config[key],
@@ -200,7 +200,7 @@ module MU
 # XXX check if error and index objs exist, and if not provide placeholders
           elsif !@config['web'] and !current["website"].nil?
             MU.log "Disabling web service on S3 bucket #{@cloud_id}", MU::NOTICE
-            MU::Cloud::AWS.s3(credentials: @config['credentials'], region: @config['region']).delete_bucket_website(
+            MU::Cloud::AWS.s3(credentials: @credentials, region: @region).delete_bucket_website(
               bucket: @cloud_id
             )
           end
@@ -225,7 +225,7 @@ module MU
 
           if @config['cors']
             MU.log "Setting CORS rules on #{@cloud_id}", details: @config['cors']
-            MU::Cloud::AWS.s3(credentials: @config['credentials'], region: @config['region']).put_bucket_cors(
+            MU::Cloud::AWS.s3(credentials: @credentials, region: @region).put_bucket_cors(
               bucket: @cloud_id,
               cors_configuration: {
                 cors_rules: symbolify_keys.call(@config['cors'])
@@ -235,7 +235,7 @@ module MU
 
           MU.log "Bucket #{@config['name']}: s3://#{@cloud_id}", MU::SUMMARY
           if @config['web']
-            MU.log "Bucket #{@config['name']} web access: http://#{@cloud_id}.s3-website-#{@config['region']}.amazonaws.com/", MU::SUMMARY
+            MU.log "Bucket #{@config['name']} web access: http://#{@cloud_id}.s3-website-#{@region}.amazonaws.com/", MU::SUMMARY
           end
         end
 
@@ -377,13 +377,13 @@ module MU
         # Canonical Amazon Resource Number for this resource
         # @return [String]
         def arn
-          "arn:"+(MU::Cloud::AWS.isGovCloud?(@config["region"]) ? "aws-us-gov" : "aws")+":s3:::"+@cloud_id
+          "arn:"+(MU::Cloud::AWS.isGovCloud?(@region) ? "aws-us-gov" : "aws")+":s3:::"+@cloud_id
         end
 
         # Return the metadata for this user cofiguration
         # @return [Hash]
         def notify
-          desc = MU::Cloud::AWS::Bucket.describe_bucket(@cloud_id, credentials: @config['credentials'], region: @config['region'])
+          desc = MU::Cloud::AWS::Bucket.describe_bucket(@cloud_id, credentials: @credentials, region: @region)
           MU.structToHash(desc)
         end
 
@@ -448,7 +448,7 @@ module MU
         def toKitten(**_args)
           bok = {
             "cloud" => "AWS",
-            "credentials" => @config['credentials'],
+            "credentials" => @credentials,
             "cloud_id" => @cloud_id
           }
 
@@ -611,7 +611,7 @@ end
           policy_docs = MU::Cloud.resourceClass("AWS", "Role").genPolicyDocument(@config['policies'], deploy_obj: @deploy, bucket_style: true, version: "2008-10-17", doc_id: doc_id)
           policy_docs.each { |doc|
             MU.log "Applying S3 bucket policy #{doc.keys.first} to bucket #{@cloud_id}", MU::NOTICE, details: JSON.pretty_generate(doc.values.first)
-            MU::Cloud::AWS.s3(credentials: @config['credentials'], region: @config['region']).put_bucket_policy(
+            MU::Cloud::AWS.s3(credentials: @credentials, region: @region).put_bucket_policy(
               bucket: @cloud_id,
               policy: JSON.generate(doc.values.first)
             )

data/modules/mu/providers/aws/cache_cluster.rb

@@ -35,7 +35,7 @@ module MU
         # Canonical Amazon Resource Number for this resource
         # @return [String]
         def arn
-          "arn:"+(MU::Cloud::AWS.isGovCloud?(@config["region"]) ? "aws-us-gov" : "aws")+":elasticache:"+@config['region']+":"+MU::Cloud::AWS.credToAcct(@config['credentials'])+":cluster/"+@cloud_id
+          "arn:"+(MU::Cloud::AWS.isGovCloud?(@region) ? "aws-us-gov" : "aws")+":elasticache:"+@region+":"+MU::Cloud::AWS.credToAcct(@credentials)+":cluster/"+@cloud_id
         end
 
         # Locate an existing Cache Cluster or Cache Clusters and return an array containing matching AWS resource descriptors for those that match.
@@ -109,7 +109,7 @@ module MU
         def addStandardTags(resource, resource_type, region: MU.curRegion)
           MU.log "Adding tags to ElasticCache resource #{resource}"
           MU::Cloud::AWS.elasticache(region: region).add_tags_to_resource(
-            resource_name: MU::Cloud::AWS::CacheCluster.getARN(resource, resource_type, "elasticache", region: @config['region'], credentials: @config['credentials']),
+            resource_name: MU::Cloud::AWS::CacheCluster.getARN(resource, resource_type, "elasticache", region: @region, credentials: @credentials),
             tags: allTags
           )
         end
@@ -170,12 +170,12 @@ module MU
             # config_struct[:preferred_cache_cluster_a_zs] = @config["preferred_cache_cluster_azs"]
 
             MU.log "Creating cache replication group #{@config['identifier']}"
-            MU::Cloud::AWS.elasticache(region: @config['region'], credentials: @config['credentials']).create_replication_group(config_struct).replication_group
+            MU::Cloud::AWS.elasticache(region: @region, credentials: @credentials).create_replication_group(config_struct).replication_group
 
             wait_start_time = Time.now
             retries = 0
             begin
-              MU::Cloud::AWS.elasticache(region: @config['region'], credentials: @config['credentials']).wait_until(:replication_group_available, replication_group_id: @config['identifier']) do |waiter|
+              MU::Cloud::AWS.elasticache(region: @region, credentials: @credentials).wait_until(:replication_group_available, replication_group_id: @config['identifier']) do |waiter|
                 waiter.max_attempts = nil
                 waiter.before_attempt do |attempts|
                   MU.log "Waiting for cache replication group #{@config['identifier']} to become available", MU::NOTICE if attempts % 5 == 0
@@ -192,11 +192,11 @@ module MU
               retry
             end
 
-            resp = MU::Cloud::AWS::CacheCluster.getCacheReplicationGroupById(@config['identifier'], region: @config['region'])
+            resp = MU::Cloud::AWS::CacheCluster.getCacheReplicationGroupById(@config['identifier'], region: @region)
 
             # We want to make sure the clusters in the cache replication group get our tags
             resp.member_clusters.each { |member|
-              addStandardTags(member, "cluster", region: @config['region'])
+              addStandardTags(member, "cluster", region: @region)
             }
 
             MU::Cloud.resourceClass("AWS", "DNSZone").genericMuDNSEntry(
@@ -228,7 +228,7 @@ module MU
 
             MU.log "Creating cache cluster #{@config['identifier']}"
             begin
-              MU::Cloud::AWS.elasticache(region: @config['region'], credentials: @config['credentials']).create_cache_cluster(config_struct).cache_cluster
+              MU::Cloud::AWS.elasticache(region: @region, credentials: @credentials).create_cache_cluster(config_struct).cache_cluster
             rescue ::Aws::ElastiCache::Errors::InvalidParameterValue => e
               if e.message.match(/security group (sg-[^\s]+)/)
                 bad_sg = Regexp.last_match[1]
@@ -243,7 +243,7 @@ module MU
             wait_start_time = Time.now
             retries = 0
             begin
-              MU::Cloud::AWS.elasticache(region: @config['region'], credentials: @config['credentials']).wait_until(:cache_cluster_available, cache_cluster_id: @config['identifier']) do |waiter|
+              MU::Cloud::AWS.elasticache(region: @region, credentials: @credentials).wait_until(:cache_cluster_available, cache_cluster_id: @config['identifier']) do |waiter|
                 waiter.max_attempts = nil
                 waiter.before_attempt do |attempts|
                   MU.log "Waiting for cache cluster #{@config['identifier']} to become available", MU::NOTICE if attempts % 5 == 0
@@ -260,7 +260,7 @@ module MU
               retry
             end
 
-            resp = MU::Cloud::AWS::CacheCluster.getCacheClusterById(@config['identifier'], region: @config['region'], credentials: @config['credentials'])
+            resp = MU::Cloud::AWS::CacheCluster.getCacheClusterById(@config['identifier'], region: @region, credentials: @credentials)
             MU.log "Cache Cluster #{@config['identifier']} is ready to use"
             @cloud_id = resp.cache_cluster_id
           end
@@ -291,10 +291,10 @@ module MU
             # If we didn't specify a VPC try to figure out if the account has a default VPC
             vpc_id = nil
             subnets = []
-            MU::Cloud::AWS.ec2(region: @config['region'], credentials: @config['credentials']).describe_vpcs.vpcs.each { |vpc|
+            MU::Cloud::AWS.ec2(region: @region, credentials: @credentials).describe_vpcs.vpcs.each { |vpc|
               if vpc.is_default
                 vpc_id = vpc.vpc_id
-                subnets = MU::Cloud::AWS.ec2(region: @config['region'], credentials: @config['credentials']).describe_subnets(
+                subnets = MU::Cloud::AWS.ec2(region: @region, credentials: @credentials).describe_subnets(
                   filters: [
                     {
                       name: "vpc-id", 
@@ -327,7 +327,7 @@ module MU
           else
             MU.log "Creating subnet group #{@config["subnet_group_name"]} for cache cluster #{@config['identifier']}"
 
-            MU::Cloud::AWS.elasticache(region: @config['region'], credentials: @config['credentials']).create_cache_subnet_group(
+            MU::Cloud::AWS.elasticache(region: @region, credentials: @credentials).create_cache_subnet_group(
               cache_subnet_group_name: @config["subnet_group_name"],
               cache_subnet_group_description: @config["subnet_group_name"],
               subnet_ids: subnet_ids
@@ -347,7 +347,7 @@ module MU
         # Create a Cache Cluster parameter group.
         def createParameterGroup        
           MU.log "Creating a cache cluster parameter group #{@config["parameter_group_name"]}"
-          MU::Cloud::AWS.elasticache(region: @config['region'], credentials: @config['credentials']).create_cache_parameter_group(
+          MU::Cloud::AWS.elasticache(region: @region, credentials: @credentials).create_cache_parameter_group(
             cache_parameter_group_name: @config["parameter_group_name"],
             cache_parameter_group_family: @config["parameter_group_family"],
             description: "Parameter group for #{@config["parameter_group_family"]}"
@@ -360,7 +360,7 @@ module MU
             }
 
             MU.log "Modifiying cache cluster parameter group #{@config["parameter_group_name"]}"
-            MU::Cloud::AWS.elasticache(region: @config['region'], credentials: @config['credentials']).modify_cache_parameter_group(
+            MU::Cloud::AWS.elasticache(region: @region, credentials: @credentials).modify_cache_parameter_group(
               cache_parameter_group_name: @config["parameter_group_name"],
               parameter_name_values: params
             )
@@ -370,7 +370,7 @@ module MU
         # Retrieve a Cache Cluster parameter group name of on existing parameter group.
         # @return [String]: Cache Cluster parameter group name.
         def getParameterGroup
-          MU::Cloud::AWS.elasticache(region: @config['region'], credentials: @config['credentials']).describe_cache_parameter_groups(
+          MU::Cloud::AWS.elasticache(region: @region, credentials: @credentials).describe_cache_parameter_groups(
             cache_parameter_group_name: @config["parameter_group_name"]
           ).cache_parameter_groups.first.cache_parameter_group_name
         end
@@ -404,7 +404,7 @@ module MU
         def notify
           ### TO DO: Flatten the replication group deployment metadata structure. It is probably waaaaaaay too nested.
           if @config["create_replication_group"]
-            repl_group = MU::Cloud::AWS::CacheCluster.getCacheReplicationGroupById(@config['identifier'], region: @config['region'], credentials: @config['credentials'])
+            repl_group = MU::Cloud::AWS::CacheCluster.getCacheReplicationGroupById(@config['identifier'], region: @region, credentials: @credentials)
             # DNS records for the "real" zone should always be registered as late as possible so override_existing only overwrites the records after the resource is ready to use.
             if @config['dns_records']
               @config['dns_records'].each { |dnsrec|
@@ -418,7 +418,7 @@ module MU
             deploy_struct = {
               "identifier" => repl_group.replication_group_id,
               "create_style" => @config["create_style"],
-              "region" => @config["region"],
+              "region" => @region,
               "members" => repl_group.member_clusters,
               "automatic_failover" => repl_group.automatic_failover,
               "snapshotting_cluster_id" => repl_group.snapshotting_cluster_id,
@@ -427,7 +427,7 @@ module MU
             }
 
             repl_group.member_clusters.each { |id|
-              cluster = MU::Cloud::AWS::CacheCluster.getCacheClusterById(id, region: @config['region'])
+              cluster = MU::Cloud::AWS::CacheCluster.getCacheClusterById(id, region: @region)
 
               vpc_sg_ids = []
               cluster.security_groups.each { |vpc_sg|
@@ -468,7 +468,7 @@ module MU
               deploy_struct[member.cache_cluster_id]["current_role"] = member.current_role
             }
           else
-            cluster = MU::Cloud::AWS::CacheCluster.getCacheClusterById(@config['identifier'], region: @config['region'], credentials: @config['credentials'])
+            cluster = MU::Cloud::AWS::CacheCluster.getCacheClusterById(@config['identifier'], region: @region, credentials: @credentials)
 
             vpc_sg_ids = []
             cluster.security_groups.each { |vpc_sg|
@@ -515,7 +515,7 @@ module MU
 
           attempts = 0
           begin
-           MU::Cloud::AWS.elasticache(region: @config['region'], credentials: @config['credentials']).create_snapshot(
+           MU::Cloud::AWS.elasticache(region: @region, credentials: @credentials).create_snapshot(
               cache_cluster_id: @config["identifier"],
               snapshot_name: snap_id
             )
@@ -535,7 +535,7 @@ module MU
             MU.log "Waiting for snapshot of cache cluster  #{@config["identifier"]} to be ready...", MU::NOTICE if attempts % 20 == 0
             MU.log "Waiting for snapshot of cache cluster #{@config["identifier"]} to be ready...", MU::DEBUG
 
-            snapshot_resp = MU::Cloud::AWS.elasticache(region: @config['region'], credentials: @config['credentials']).describe_snapshots(snapshot_name: snap_id)
+            snapshot_resp = MU::Cloud::AWS.elasticache(region: @region, credentials: @credentials).describe_snapshots(snapshot_name: snap_id)
             attempts += 1
             break unless snapshot_resp.snapshots.first.snapshot_status != "available"
             sleep 15
@@ -546,7 +546,7 @@ module MU
 
         # @return [String]: The cloud provider's identifier for the snapshot.
         def getExistingSnapshot
-          MU::Cloud::AWS.elasticache(region: @config['region'], credentials: @config['credentials']).describe_snapshots(snapshot_name: @config["identifier"]).snapshots.first.snapshot_name
+          MU::Cloud::AWS.elasticache(region: @region, credentials: @credentials).describe_snapshots(snapshot_name: @config["identifier"]).snapshots.first.snapshot_name
         rescue NoMethodError
           raise MuError, "Snapshot #{@config["identifier"]} doesn't exist, make sure you provided a valid snapshot ID/Name"
         end

data/modules/mu/providers/aws/cdn.rb

@@ -227,7 +227,7 @@ module MU
         def toKitten(**_args)
           bok = {
             "cloud" => "AWS",
-            "credentials" => @config['credentials'],
+            "credentials" => @credentials,
             "cloud_id" => @cloud_id
           }
 
@@ -512,7 +512,7 @@ module MU
                 end
                 target_ref = MU::Config::Ref.get(o[sib_type])
                 if target_ref.name
-                  MU::Config.addDependency(cdn, target_ref.name, sib_type, phase: "groom")
+                  MU::Config.addDependency(cdn, target_ref.name, sib_type, their_phase: "groom")
                 end
                 count += 1
               end

data/modules/mu/providers/aws/collection.rb

@@ -25,15 +25,15 @@ module MU
         def initialize(**args)
           super
           @mu_name ||= @deploy.getResourceName(@config['name'], need_unique_string: true)
-          MU.setVar("curRegion", @config['region']) if !@config['region'].nil?
+          MU.setVar("curRegion", @region) if !@region.nil?
         end
 
 
         # Called automatically by {MU::Deploy#createResources}
         def create
           flag="SUCCESS"
-          MU.setVar("curRegion", @config['region']) if !@config['region'].nil?
-          region = @config['region']
+          MU.setVar("curRegion", @region) if !@region.nil?
+          region = @region
           server=@config["name"]
           stack_name = getStackName(@config["name"])
 
@@ -108,10 +108,10 @@ module MU
             end
 
             MU.log "Creating CloudFormation stack '#{@config['name']}'", details: stack_descriptor
-            MU::Cloud::AWS.cloudformation(region: region, credentials: @config['credentials']).create_stack(stack_descriptor);
+            MU::Cloud::AWS.cloudformation(region: region, credentials: @credentials).create_stack(stack_descriptor);
 
             sleep(10);
-            stack_response = MU::Cloud::AWS.cloudformation(region: region, credentials: @config['credentials']).describe_stacks({:stack_name => stack_name}).stacks.first
+            stack_response = MU::Cloud::AWS.cloudformation(region: region, credentials: @credentials).describe_stacks({:stack_name => stack_name}).stacks.first
             attempts = 0
             begin
               if attempts % 5 == 0
@@ -119,7 +119,7 @@ module MU
               else
                 MU.log "Waiting for CloudFormation stack '#{@config['name']}' to be ready...", MU::DEBUG
               end
-              stack_response =MU::Cloud::AWS.cloudformation(region: region, credentials: @config['credentials']).describe_stacks({:stack_name => stack_name}).stacks.first
+              stack_response =MU::Cloud::AWS.cloudformation(region: region, credentials: @credentials).describe_stacks({:stack_name => stack_name}).stacks.first
               sleep 60
             end while stack_response.stack_status == "CREATE_IN_PROGRESS"
 
@@ -135,14 +135,14 @@ module MU
           end
 
           if flag == "FAIL" then
-            MU::Cloud::AWS.cloudformation(region: region, credentials: @config['credentials']).delete_stack({:stack_name => stack_name})
+            MU::Cloud::AWS.cloudformation(region: region, credentials: @credentials).delete_stack({:stack_name => stack_name})
             exit 1
           end
 
           MU.log "CloudFormation stack '#{@config['name']}' complete"
 
           begin
-            resources = MU::Cloud::AWS.cloudformation(region: region, credentials: @config['credentials']).describe_stack_resources(:stack_name => stack_name)
+            resources = MU::Cloud::AWS.cloudformation(region: region, credentials: @credentials).describe_stack_resources(:stack_name => stack_name)
 
             resources[:stack_resources].each { |resource|
 
@@ -150,7 +150,7 @@ module MU
                 when "AWS::EC2::Instance"
                   MU::Cloud::AWS.createStandardTags(resource.physical_resource_id)
                   instance_name = MU.deploy_id+"-"+@config['name']+"-"+resource.logical_resource_id
-                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", instance_name, credentials: @config['credentials'])
+                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", instance_name, credentials: @credentials)
 
                   instance = MU::Cloud.resourceClass("AWS", "Server").notifyDeploy(
                       @config['name']+"-"+resource.logical_resource_id,
@@ -177,14 +177,14 @@ module MU
 
                 when "AWS::EC2::SecurityGroup"
                   MU::Cloud::AWS.createStandardTags(resource.physical_resource_id)
-                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", MU.deploy_id+"-"+@config['name']+'-'+resource.logical_resource_id, credentials: @config['credentials'])
+                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", MU.deploy_id+"-"+@config['name']+'-'+resource.logical_resource_id, credentials: @credentials)
                   MU::Cloud.resourceClass("AWS", "FirewallRule").notifyDeploy(
                       @config['name']+"-"+resource.logical_resource_id,
                       resource.physical_resource_id
                   )
                 when "AWS::EC2::Subnet"
                   MU::Cloud::AWS.createStandardTags(resource.physical_resource_id)
-                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", MU.deploy_id+"-"+@config['name']+'-'+resource.logical_resource_id, credentials: @config['credentials'])
+                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", MU.deploy_id+"-"+@config['name']+'-'+resource.logical_resource_id, credentials: @credentials)
                   data = {
                       "collection" => @config["name"],
                       "subnet_id" => resource.physical_resource_id,
@@ -192,7 +192,7 @@ module MU
                   @deploy.notify("subnets", @config['name']+"-"+resource.logical_resource_id, data)
                 when "AWS::EC2::VPC"
                   MU::Cloud::AWS.createStandardTags(resource.physical_resource_id)
-                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", MU.deploy_id+"-"+@config['name']+'-'+resource.logical_resource_id, credentials: @config['credentials'])
+                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", MU.deploy_id+"-"+@config['name']+'-'+resource.logical_resource_id, credentials: @credentials)
                   data = {
                       "collection" => @config["name"],
                       "vpc_id" => resource.physical_resource_id,
@@ -200,10 +200,10 @@ module MU
                   @deploy.notify("vpcs", @config['name']+"-"+resource.logical_resource_id, data)
                 when "AWS::EC2::InternetGateway"
                   MU::Cloud::AWS.createStandardTags(resource.physical_resource_id)
-                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", MU.deploy_id+"-"+@config['name']+'-'+resource.logical_resource_id, credentials: @config['credentials'])
+                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", MU.deploy_id+"-"+@config['name']+'-'+resource.logical_resource_id, credentials: @credentials)
                 when "AWS::EC2::RouteTable"
                   MU::Cloud::AWS.createStandardTags(resource.physical_resource_id)
-                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", MU.deploy_id+"-"+@config['name']+'-'+resource.logical_resource_id, credentials: @config['credentials'])
+                  MU::Cloud::AWS.createTag(resource.physical_resource_id, "Name", MU.deploy_id+"-"+@config['name']+'-'+resource.logical_resource_id, credentials: @credentials)
 
                 # The rest of these aren't anything we act on
                 when "AWS::EC2::Route"