Ensuring that any calls to aws.getAmi are now aws.ec2.getAmi (pulumi#928

)
jaindheerain · Mar 4, 2021 · 978d32b · 978d32b
1 parent 8396323
commit 978d32b
Show file tree

Hide file tree

Showing 21 changed files with 172 additions and 59 deletions.
diff --git a/aws-cs-webserver/WebServerStack.cs b/aws-cs-webserver/WebServerStack.cs
@@ -10,11 +10,11 @@ class WebServerStack : Stack
 {
  public WebServerStack()
  {
- var ami = Output.Create(GetAmi.InvokeAsync(new GetAmiArgs
+ var ami = Output.Create(Pulumi.Aws.Ec2.GetAmi.InvokeAsync(new Pulumi.Aws.Ec2.GetAmiArgs
  {
  MostRecent = true,
  Owners = {"137112412989"},
- Filters = {new GetAmiFilterArgs {Name = "name", Values = {"amzn-ami-hvm-*"}}}
+ Filters = {new Pulumi.Aws.Ec2.Inputs.GetAmiFilterArgs {Name = "name", Values = {"amzn-ami-hvm-*"}}}
  }));
 
  var group = new SecurityGroup("web-secgrp", new SecurityGroupArgs

diff --git a/aws-go-webserver/go.mod b/aws-go-webserver/go.mod
@@ -3,6 +3,6 @@ module github.com/pulumi/examples/aws-go-webserver
 go 1.13
 
 require (
- github.com/pulumi/pulumi-aws/sdk/v3 v3.1.0
- github.com/pulumi/pulumi/sdk/v2 v2.5.0
+ github.com/pulumi/pulumi-aws/sdk/v3 v3.31.0
+ github.com/pulumi/pulumi/sdk/v2 v2.22.0
 )
diff --git a/aws-go-webserver/go.sum b/aws-go-webserver/go.sum
diff --git a/aws-go-webserver/main.go b/aws-go-webserver/main.go
@@ -1,7 +1,6 @@
 package main
 
 import (
- "github.com/pulumi/pulumi-aws/sdk/v3/go/aws"
  "github.com/pulumi/pulumi-aws/sdk/v3/go/aws/ec2"
  "github.com/pulumi/pulumi/sdk/v2/go/pulumi"
 )
@@ -25,8 +24,8 @@ func main() {
 
  // Get the ID for the latest Amazon Linux AMI.
  mostRecent := true
- ami, err := aws.GetAmi(ctx, &aws.GetAmiArgs{
- Filters: []aws.GetAmiFilter{
+ ami, err := ec2.LookupAmi(ctx, &ec2.LookupAmiArgs{
+ Filters: []ec2.GetAmiFilter{
  {
  Name: "name",
  Values: []string{"amzn-ami-hvm-*-x86_64-ebs"},

diff --git a/aws-js-webserver-component/webserver.js b/aws-js-webserver-component/webserver.js
@@ -4,7 +4,7 @@ const pulumi = require("@pulumi/pulumi");
 const aws = require("@pulumi/aws");
 
 // Get the id for the latest Amazon Linux AMI
-let ami = aws.getAmi({
+let ami = aws.ec2.getAmi({
  filters: [
  { name: "name", values: ["amzn-ami-hvm-*-x86_64-ebs"] },
  ],

diff --git a/aws-js-webserver/index.js b/aws-js-webserver/index.js
@@ -6,7 +6,7 @@ const aws = require("@pulumi/aws");
 let size = "t2.micro"; // t2.micro is available in the AWS free tier
 
 // Get the id for the latest Amazon Linux AMI
-let ami = aws.getAmi({
+let ami = aws.ec2.getAmi({
  filters: [
  { name: "name", values: ["amzn-ami-hvm-*-x86_64-ebs"] },
  ],

diff --git a/aws-py-ec2-provisioners/__main__.py b/aws-py-ec2-provisioners/__main__.py
@@ -31,10 +31,10 @@ def decode_key(key):
 )
 
 # Get the AMI
-ami = aws.get_ami(
+ami = aws.ec2.get_ami(
  owners=['amazon'],
  most_recent=True,
- filters=[aws.GetAmiFilterArgs(
+ filters=[aws.ec2.GetAmiFilterArgs(
  name='name',
  values=['amzn2-ami-hvm-2.0.????????-x86_64-gp2'],
  )],

diff --git a/aws-ts-ec2-provisioners/index.ts b/aws-ts-ec2-provisioners/index.ts
@@ -34,7 +34,7 @@ const secgrp = new aws.ec2.SecurityGroup("secgrp", {
 });
 
 // Get the AMI
-const amiId = aws.getAmi({
+const amiId = aws.ec2.getAmi({
  owners: ["amazon"],
  mostRecent: true,
  filters: [{

diff --git a/aws-ts-ruby-on-rails/index.ts b/aws-ts-ruby-on-rails/index.ts
@@ -15,7 +15,7 @@ const webSg = new aws.ec2.SecurityGroup("webServerSecurityGroup", {
  ],
 });
 
-const amiId = aws.getAmi({
+const amiId = aws.ec2.getAmi({
  filters: [
  {
  name: "name",

diff --git a/aws-ts-stackreference/team/index.ts b/aws-ts-stackreference/team/index.ts
@@ -21,7 +21,7 @@ const combinedTags = {
  "Managed By": "Pulumi",
 };
 
-const amiId = aws.getAmi({
+const amiId = aws.ec2.getAmi({
  owners: ["099720109477"], // Ubuntu
  mostRecent: true,
  filters: [

diff --git a/f5bigip-ts-ltm-pool/f5bigip-ec2-instance/index.ts b/f5bigip-ts-ltm-pool/f5bigip-ec2-instance/index.ts
@@ -33,7 +33,7 @@ const firewall = new aws.ec2.SecurityGroup("bigIp", {
  --filters "Name=product-code,Values=8esk90vx7v713sa0muq2skw3j" \
  --filters "Name=name,Values='F5 Networks BIGIP-14.0.0.1-0.0.2 PAYG - Good 25Mbps *'"
 */
-const bigIpAmiId = aws.getAmi({
+const bigIpAmiId = aws.ec2.getAmi({
  mostRecent: true,
  owners: ["679593333241"],
  filters: [

diff --git a/f5bigip-ts-ltm-pool/nginx-ec2-instance/index.ts b/f5bigip-ts-ltm-pool/nginx-ec2-instance/index.ts
@@ -7,7 +7,7 @@ const baseTags = {
  project: `${pulumi.getProject()}-${pulumi.getStack()}`,
 };
 
-const ubuntuAmiId = aws.getAmi({
+const ubuntuAmiId = aws.ec2.getAmi({
  mostRecent: true,
  nameRegex: "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*",
  owners: ["099720109477"],

diff --git a/testing-unit-cs/WebserverStack.cs b/testing-unit-cs/WebserverStack.cs
@@ -23,12 +23,12 @@ public WebserverStack()
  }
  });
 
- var amiId = Output.Create(GetAmi.InvokeAsync(new GetAmiArgs
+ var amiId = Output.Create(Pulumi.Aws.Ec2.GetAmi.InvokeAsync(new Pulumi.Aws.Ec2.GetAmiArgs
  {
  MostRecent = true,
  Owners = {"099720109477"},
  Filters = {
- new GetAmiFilterArgs
+ new Pulumi.Aws.Ec2.Inputs.GetAmiFilterArgs
  {
  Name = "name",
  Values = {"ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*"},

diff --git a/testing-unit-go/go.mod b/testing-unit-go/go.mod
@@ -3,7 +3,7 @@ module github.com/pulumi/examples/testing-unit-go
 go 1.13
 
 require (
- github.com/pulumi/pulumi-aws/sdk/v3 v3.1.0
- github.com/pulumi/pulumi/sdk/v2 v2.2.1
- github.com/stretchr/testify v1.5.1
+ github.com/pulumi/pulumi-aws/sdk/v3 v3.31.0
+ github.com/pulumi/pulumi/sdk/v2 v2.22.0
+ github.com/stretchr/testify v1.6.1
 )