From 9df507d42050d9ddb84b9f6d5b698bcdfa064186 Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Wed, 11 Mar 2020 11:17:57 -0700 Subject: [PATCH] Use `vpc_security_group_ids` instead of `security_groups`. (#600) `security_groups` doesn't allow for updates while `vpc_security_group_ids` does. See pulumi/pulumi-aws#852 for more context. Also, updated `Buffer` usage based on https://nodejs.org/fr/docs/guides/buffer-constructor-deprecation/. --- aws-cs-webserver/Program.cs | 2 +- aws-js-webserver-component/webserver.js | 2 +- aws-js-webserver/index.js | 4 ++-- aws-py-webserver/__main__.py | 2 +- aws-ts-ec2-provisioners/index.ts | 4 ++-- aws-ts-ruby-on-rails/index.ts | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aws-cs-webserver/Program.cs b/aws-cs-webserver/Program.cs index 9e70d1484..b6a3de9a5 100644 --- a/aws-cs-webserver/Program.cs +++ b/aws-cs-webserver/Program.cs @@ -49,7 +49,7 @@ static Task Main() var server = new Instance("web-server-www", new InstanceArgs { InstanceType = Size, - SecurityGroups = { group.Name }, + VpcSecurityGroupIds = { group.Id }, UserData = userData, Ami = ami.Id, }); diff --git a/aws-js-webserver-component/webserver.js b/aws-js-webserver-component/webserver.js index 580c5f47f..7603f0533 100644 --- a/aws-js-webserver-component/webserver.js +++ b/aws-js-webserver-component/webserver.js @@ -30,7 +30,7 @@ exports.createInstance = function (name, size) { return new aws.ec2.Instance(name, { tags: { "Name": name }, instanceType: size, - securityGroups: [ group.name ], // reference the group object above + vpcSecurityGroupIds: [ group.id ], // reference the group object above ami: ami, userData: userData // start a simple web server }); diff --git a/aws-js-webserver/index.js b/aws-js-webserver/index.js index dbbd0ffb5..d4cafd6d0 100644 --- a/aws-js-webserver/index.js +++ b/aws-js-webserver/index.js @@ -31,10 +31,10 @@ nohup python -m SimpleHTTPServer 80 &`; let server = new aws.ec2.Instance("web-server-www", { tags: { "Name": "web-server-www" }, instanceType: size, - securityGroups: [ group.name ], // reference the group object above + vpcSecurityGroupIds: [ group.id ], // reference the group object above ami: ami, userData: userData // start a simple web server }); exports.publicIp = server.publicIp; -exports.publicHostName = server.publicDns; \ No newline at end of file +exports.publicHostName = server.publicDns; diff --git a/aws-py-webserver/__main__.py b/aws-py-webserver/__main__.py index e0c5eceb0..a4e59a8a2 100644 --- a/aws-py-webserver/__main__.py +++ b/aws-py-webserver/__main__.py @@ -23,7 +23,7 @@ server = aws.ec2.Instance('web-server-www', instance_type=size, - security_groups=[group.name], + vpc_security_group_ids=[group.id], user_data=user_data, ami=ami.id) diff --git a/aws-ts-ec2-provisioners/index.ts b/aws-ts-ec2-provisioners/index.ts index 9b2754626..d353a3711 100644 --- a/aws-ts-ec2-provisioners/index.ts +++ b/aws-ts-ec2-provisioners/index.ts @@ -18,7 +18,7 @@ const privateKey = config.requireSecret("privateKey").apply(key => { if (key.startsWith("-----BEGIN RSA PRIVATE KEY-----")) { return key; } else { - return new Buffer(key, "base64").toString("ascii"); + return Buffer.from(key, "base64").toString("ascii"); } }); const privateKeyPassphrase = config.getSecret("privateKeyPassphrase"); @@ -52,7 +52,7 @@ const server = new aws.ec2.Instance("server", { instanceType: size, ami: amiId, keyName: keyName, - securityGroups: [ secgrp.name ], + vpcSecurityGroupIds: [ secgrp.id ], }); const conn = { host: server.publicIp, diff --git a/aws-ts-ruby-on-rails/index.ts b/aws-ts-ruby-on-rails/index.ts index d186e0eb6..771936b9a 100644 --- a/aws-ts-ruby-on-rails/index.ts +++ b/aws-ts-ruby-on-rails/index.ts @@ -33,7 +33,7 @@ const amiId = aws.getAmi({ const webServer = new aws.ec2.Instance("webServer", { ami: amiId, instanceType: config.instanceType, - securityGroups: [ webSg.name ], + vpcSecurityGroupIds: [ webSg.id ], userData: createUserData( [ "install_ruby_2_3_1", "install_mysql", "configure_mysql", "install_application" ], {