build: instead of external referenced vpc, create own dedicated only to the users-api

lsipii · lsipii · commit bee09f57f2b3 · 2023-07-19T12:43:04.000+03:00
diff --git a/VirtualFinland.UsersAPI.Deployment/Common/Models/StackSetup.cs b/VirtualFinland.UsersAPI.Deployment/Common/Models/StackSetup.cs
@@ -8,5 +8,4 @@ public record StackSetup
     public bool IsProductionEnvironment;
     public string Environment = default!;
     public string ProjectName = default!;
-    public VpcSetup VpcSetup = default!;
 }
diff --git a/VirtualFinland.UsersAPI.Deployment/Common/Models/VpcSetup.cs b/VirtualFinland.UsersAPI.Deployment/Common/Models/VpcSetup.cs
diff --git a/VirtualFinland.UsersAPI.Deployment/Features/DatabaseMigratorLambda.cs b/VirtualFinland.UsersAPI.Deployment/Features/DatabaseMigratorLambda.cs
@@ -12,7 +12,7 @@ namespace VirtualFinland.UsersAPI.Deployment.Features;
 
 class DatabaseMigratorLambda
 {
-    public DatabaseMigratorLambda(Config config, StackSetup stackSetup, SecretsManager secretsManager)
+    public DatabaseMigratorLambda(Config config, StackSetup stackSetup, VpcSetup vpcSetup, SecretsManager secretsManager)
     {
         // Lambda function
         var execRole = new Role($"{stackSetup.ProjectName}-DatabaseMigratorLambdaRole-{stackSetup.Environment}", new RoleArgs
@@ -76,14 +76,14 @@ public DatabaseMigratorLambda(Config config, StackSetup stackSetup, SecretsManag
 
         var defaultSecurityGroup = Pulumi.Aws.Ec2.GetSecurityGroup.Invoke(new GetSecurityGroupInvokeArgs()
         {
-            VpcId = stackSetup.VpcSetup.VpcId,
+            VpcId = vpcSetup.VpcId,
             Name = "default"
         });
 
         var functionVpcArgs = new FunctionVpcConfigArgs()
         {
             SecurityGroupIds = defaultSecurityGroup.Apply(o => $"{o.Id}"),
-            SubnetIds = stackSetup.VpcSetup.PrivateSubnetIds
+            SubnetIds = vpcSetup.PrivateSubnetIds
         };
 
         var appArtifactPath = Environment.GetEnvironmentVariable("DB_MIGRATOR_ARTIFACT_PATH") ?? config.Require("dbMigratorArtifactPath");
diff --git a/VirtualFinland.UsersAPI.Deployment/Features/LambdaFunctionUrl.cs b/VirtualFinland.UsersAPI.Deployment/Features/LambdaFunctionUrl.cs
@@ -16,7 +16,7 @@ namespace VirtualFinland.UsersAPI.Deployment.Features;
 /// </summary>
 class LambdaFunctionUrl
 {
-    public LambdaFunctionUrl(Config config, StackSetup stackSetup, SecretsManager secretsManager)
+    public LambdaFunctionUrl(Config config, StackSetup stackSetup, VpcSetup vpcSetup, SecretsManager secretsManager)
     {
         // External references
         var codesetStackReference = new StackReference($"{Pulumi.Deployment.Instance.OrganizationName}/codesets/{stackSetup.Environment}");
@@ -84,14 +84,14 @@ public LambdaFunctionUrl(Config config, StackSetup stackSetup, SecretsManager se
 
         var defaultSecurityGroup = Pulumi.Aws.Ec2.GetSecurityGroup.Invoke(new GetSecurityGroupInvokeArgs()
         {
-            VpcId = stackSetup.VpcSetup.VpcId,
+            VpcId = vpcSetup.VpcId,
             Name = "default"
         });
 
         var functionVpcArgs = new FunctionVpcConfigArgs()
         {
             SecurityGroupIds = defaultSecurityGroup.Apply(o => $"{o.Id}"),
-            SubnetIds = stackSetup.VpcSetup.PrivateSubnetIds
+            SubnetIds = vpcSetup.PrivateSubnetIds
         };
 
         var appArtifactPath = Environment.GetEnvironmentVariable("APPLICATION_ARTIFACT_PATH") ?? config.Require("appArtifactPath");
diff --git a/VirtualFinland.UsersAPI.Deployment/Features/PostgresDatabase.cs b/VirtualFinland.UsersAPI.Deployment/Features/PostgresDatabase.cs
@@ -11,11 +11,11 @@ namespace VirtualFinland.UsersAPI.Deployment.Features;
 /// </summary>
 public class PostgresDatabase
 {
-    public PostgresDatabase(Config config, StackSetup stackSetup)
+    public PostgresDatabase(Config config, StackSetup stackSetup, VpcSetup vpcSetup)
     {
         var dbSubNetGroup = new Pulumi.Aws.Rds.SubnetGroup("dbsubnets", new()
         {
-            SubnetIds = stackSetup.VpcSetup.PrivateSubnetIds,
+            SubnetIds = vpcSetup.PrivateSubnetIds,
         });
 
         var password = new RandomPassword("password", new()
diff --git a/VirtualFinland.UsersAPI.Deployment/Features/VpcSetup.cs b/VirtualFinland.UsersAPI.Deployment/Features/VpcSetup.cs
@@ -0,0 +1,28 @@
+using System.Collections.Immutable;
+using Pulumi;
+using Pulumi.Awsx.Ec2;
+using Pulumi.Awsx.Ec2.Inputs;
+
+namespace VirtualFinland.UsersAPI.Deployment.Common.Models;
+
+public class VpcSetup
+{
+    public VpcSetup(StackSetup stackSetup)
+    {
+        var vpc = new Vpc($"{stackSetup.ProjectName}-vf-vpc-{stackSetup.Environment}", new VpcArgs()
+        {
+            Tags = stackSetup.Tags,
+            EnableDnsHostnames = true,
+            NatGateways = new NatGatewayConfigurationArgs
+            {
+                Strategy = stackSetup.IsProductionEnvironment ? NatGatewayStrategy.OnePerAz : NatGatewayStrategy.Single
+            }
+        });
+
+        this.VpcId = vpc.VpcId;
+        this.PrivateSubnetIds = vpc.PrivateSubnetIds;
+    }
+
+    public Input<string>? VpcId = default!;
+    public Output<ImmutableArray<string>> PrivateSubnetIds = default!;
+}
diff --git a/VirtualFinland.UsersAPI.Deployment/UsersAPIStack.cs b/VirtualFinland.UsersAPI.Deployment/UsersAPIStack.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
 using Pulumi;
 using VirtualFinland.UsersAPI.Deployment.Common;
 using VirtualFinland.UsersAPI.Deployment.Common.Models;
@@ -17,11 +14,6 @@ public UsersApiStack()
         var environment = Pulumi.Deployment.Instance.StackName;
         var projectName = Pulumi.Deployment.Instance.ProjectName;
 
-        var infraStackReference = new StackReference($"{Pulumi.Deployment.Instance.OrganizationName}/{config.Require("infraStackReferenceName")}/{environment}");
-        var infraStackReferencePrivateSubnetIds = infraStackReference.RequireOutput("PrivateSubnetIds");
-        var infraStackReferencePrivateSubnetIdsAsList = infraStackReferencePrivateSubnetIds.Apply(o => ((ImmutableArray<object>)(o ?? new ImmutableArray<object>())).Select(x => x.ToString()));
-        var infraStackReferenceVpcId = infraStackReference.RequireOutput("VpcId");
-
         InputMap<string> tags = new InputMap<string>()
         {
             {
@@ -38,22 +30,18 @@ public UsersApiStack()
             Environment = environment,
             IsProductionEnvironment = isProductionEnvironment,
             Tags = tags,
-            VpcSetup = new VpcSetup()
-            {
-                VpcId = Output.Format($"{infraStackReferenceVpcId}"),
-                PrivateSubnetIds = infraStackReferencePrivateSubnetIdsAsList as Output<IEnumerable<string>>
-            }
         };
 
-        var dbConfigs = new PostgresDatabase(config, stackSetup);
+        var vpcSetup = new VpcSetup(stackSetup);
+        var dbConfigs = new PostgresDatabase(config, stackSetup, vpcSetup);
         var secretManagerSecret = new SecretsManager(config, stackSetup, dbConfigs);
 
-        var lambdaFunctionConfigs = new LambdaFunctionUrl(config, stackSetup, secretManagerSecret);
+        var lambdaFunctionConfigs = new LambdaFunctionUrl(config, stackSetup, vpcSetup, secretManagerSecret);
         ApplicationUrl = lambdaFunctionConfigs.ApplicationUrl;
         LambdaId = lambdaFunctionConfigs.LambdaFunctionId;
         DBIdentifier = dbConfigs.DBIdentifier;
 
-        var databaseMigratorLambda = new DatabaseMigratorLambda(config, stackSetup, secretManagerSecret);
+        var databaseMigratorLambda = new DatabaseMigratorLambda(config, stackSetup, vpcSetup, secretManagerSecret);
         DatabaseMigratorLambdaArn = databaseMigratorLambda.LambdaFunctionArn;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,4 @@ public record StackSetup`
`8`	`8`	`public bool IsProductionEnvironment;`
`9`	`9`	`public string Environment = default!;`
`10`	`10`	`public string ProjectName = default!;`
`11`		`- public VpcSetup VpcSetup = default!;`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace VirtualFinland.UsersAPI.Deployment.Features;`
`12`	`12`
`13`	`13`	`class DatabaseMigratorLambda`
`14`	`14`	`{`
`15`		`- public DatabaseMigratorLambda(Config config, StackSetup stackSetup, SecretsManager secretsManager)`
	`15`	`+ public DatabaseMigratorLambda(Config config, StackSetup stackSetup, VpcSetup vpcSetup, SecretsManager secretsManager)`
`16`	`16`	`{`
`17`	`17`	`// Lambda function`
`18`	`18`	`var execRole = new Role($"{stackSetup.ProjectName}-DatabaseMigratorLambdaRole-{stackSetup.Environment}", new RoleArgs`
`@@ -76,14 +76,14 @@ public DatabaseMigratorLambda(Config config, StackSetup stackSetup, SecretsManag`
`76`	`76`
`77`	`77`	`var defaultSecurityGroup = Pulumi.Aws.Ec2.GetSecurityGroup.Invoke(new GetSecurityGroupInvokeArgs()`
`78`	`78`	`{`
`79`		`- VpcId = stackSetup.VpcSetup.VpcId,`
	`79`	`+ VpcId = vpcSetup.VpcId,`
`80`	`80`	`Name = "default"`
`81`	`81`	`});`
`82`	`82`
`83`	`83`	`var functionVpcArgs = new FunctionVpcConfigArgs()`
`84`	`84`	`{`
`85`	`85`	`SecurityGroupIds = defaultSecurityGroup.Apply(o => $"{o.Id}"),`
`86`		`- SubnetIds = stackSetup.VpcSetup.PrivateSubnetIds`
	`86`	`+ SubnetIds = vpcSetup.PrivateSubnetIds`
`87`	`87`	`};`
`88`	`88`
`89`	`89`	`var appArtifactPath = Environment.GetEnvironmentVariable("DB_MIGRATOR_ARTIFACT_PATH") ?? config.Require("dbMigratorArtifactPath");`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace VirtualFinland.UsersAPI.Deployment.Features;`
`16`	`16`	`/// </summary>`
`17`	`17`	`class LambdaFunctionUrl`
`18`	`18`	`{`
`19`		`- public LambdaFunctionUrl(Config config, StackSetup stackSetup, SecretsManager secretsManager)`
	`19`	`+ public LambdaFunctionUrl(Config config, StackSetup stackSetup, VpcSetup vpcSetup, SecretsManager secretsManager)`
`20`	`20`	`{`
`21`	`21`	`// External references`
`22`	`22`	`var codesetStackReference = new StackReference($"{Pulumi.Deployment.Instance.OrganizationName}/codesets/{stackSetup.Environment}");`
`@@ -84,14 +84,14 @@ public LambdaFunctionUrl(Config config, StackSetup stackSetup, SecretsManager se`
`84`	`84`
`85`	`85`	`var defaultSecurityGroup = Pulumi.Aws.Ec2.GetSecurityGroup.Invoke(new GetSecurityGroupInvokeArgs()`
`86`	`86`	`{`
`87`		`- VpcId = stackSetup.VpcSetup.VpcId,`
	`87`	`+ VpcId = vpcSetup.VpcId,`
`88`	`88`	`Name = "default"`
`89`	`89`	`});`
`90`	`90`
`91`	`91`	`var functionVpcArgs = new FunctionVpcConfigArgs()`
`92`	`92`	`{`
`93`	`93`	`SecurityGroupIds = defaultSecurityGroup.Apply(o => $"{o.Id}"),`
`94`		`- SubnetIds = stackSetup.VpcSetup.PrivateSubnetIds`
	`94`	`+ SubnetIds = vpcSetup.PrivateSubnetIds`
`95`	`95`	`};`
`96`	`96`
`97`	`97`	`var appArtifactPath = Environment.GetEnvironmentVariable("APPLICATION_ARTIFACT_PATH") ?? config.Require("appArtifactPath");`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@ namespace VirtualFinland.UsersAPI.Deployment.Features;`
`11`	`11`	`/// </summary>`
`12`	`12`	`public class PostgresDatabase`
`13`	`13`	`{`
`14`		`- public PostgresDatabase(Config config, StackSetup stackSetup)`
	`14`	`+ public PostgresDatabase(Config config, StackSetup stackSetup, VpcSetup vpcSetup)`
`15`	`15`	`{`
`16`	`16`	`var dbSubNetGroup = new Pulumi.Aws.Rds.SubnetGroup("dbsubnets", new()`
`17`	`17`	`{`
`18`		`- SubnetIds = stackSetup.VpcSetup.PrivateSubnetIds,`
	`18`	`+ SubnetIds = vpcSetup.PrivateSubnetIds,`
`19`	`19`	`});`
`20`	`20`
`21`	`21`	`var password = new RandomPassword("password", new()`