Updated IaC to use non-deprecated Cloudflare stuff

ProgrammerAL · ProgrammerAL · commit 522e96e9b66f · 2025-06-05T10:51:13.000-04:00
diff --git a/infra/pulumi-infra-deploy/StackBuilders/RouteFilterWorker/RouteFilterInfrastructure.cs b/infra/pulumi-infra-deploy/StackBuilders/RouteFilterWorker/RouteFilterInfrastructure.cs
@@ -11,5 +11,5 @@ public record RouteFilterInfrastructure(
 {
 
     public record WorkerInfrastructure(
-        Cloudflare.WorkerScript Script, Cloudflare.WorkerRoute workerRoute);
+        Cloudflare.WorkersScript Script, Cloudflare.WorkersRoute workerRoute);
 }
diff --git a/infra/pulumi-infra-deploy/StackBuilders/RouteFilterWorker/RouteFilterStackBuilder.cs b/infra/pulumi-infra-deploy/StackBuilders/RouteFilterWorker/RouteFilterStackBuilder.cs
@@ -6,6 +6,7 @@
 using ProgrammerAl.Site.IaC.Utilities;
 using ProgrammerAl.Site.IaC.Config.GlobalConfigs;
 using ProgrammerAl.Site.IaC.StackBuilders.StorageApi;
+using Pulumi.Cloudflare.Inputs;
 
 namespace ProgrammerAl.Site.IaC.StackBuilders.RouteFilterWorker;
 
@@ -26,29 +27,30 @@ public RouteFilterInfrastructure GenerateResources()
     private WorkerInfrastructure CreateWorker(string serviceName, Provider provider)
     {
         var name = $"{serviceName}-script";
-        var apiScript = new WorkerScript(name, new()
+        var apiScript = new WorkersScript(name, new()
         {
             AccountId = GlobalConfig.CloudflareConfig.AccountId,
-            Name = GlobalConfig.RouteFilterWorkerConfig.ServiceName,
+            ScriptName = GlobalConfig.RouteFilterWorkerConfig.ServiceName,
             Content = File.ReadAllText(GlobalConfig.DeploymentPackagesConfig.RouteFilterWorkerFilePath),
-            Module = true,
-            PlainTextBindings = new[]
+            MainModule = name,
+            Bindings = new[] 
             {
-                new Pulumi.Cloudflare.Inputs.WorkerScriptPlainTextBindingArgs
+                new WorkersScriptBindingArgs
                 {
                     Name = "STORAGE_API_ENDPOINT",
                     Text = StorageApiInfra.Domain.HttpsEndpoint,
+                    Type = "plain_text",
                 },
             }
         }, new CustomResourceOptions
         {
             Provider = provider
         });
 
-        var workerRoute = new WorkerRoute($"{serviceName}-route", new WorkerRouteArgs
+        var workerRoute = new WorkersRoute($"{serviceName}-route", new WorkersRouteArgs
         {
             ZoneId = GlobalConfig.RouteFilterWorkerConfig.CloudflareZoneId,
-            ScriptName = apiScript.Name,
+            Script = apiScript.ScriptName,
             Pattern = GlobalConfig.RouteFilterWorkerConfig.RoutePattern,
 
         }, new CustomResourceOptions
diff --git a/infra/pulumi-infra-deploy/StackBuilders/StorageApi/StorageApiInfrastructure.cs b/infra/pulumi-infra-deploy/StackBuilders/StorageApi/StorageApiInfrastructure.cs
@@ -16,10 +16,10 @@ public record StorageInfrastructure(
         Cloudflare.R2Bucket Bucket);
 
     public record ApiInfrastructure(
-        Cloudflare.WorkerScript Script,
+        Cloudflare.WorkersScript Script,
         Pulumi.Random.RandomUuid AdminAuthToken);
 
     public record DomainInfrastructure(
-        Cloudflare.WorkerDomain WorkerDomain,
+        Cloudflare.WorkersCustomDomain WorkerDomain,
         Output<string> HttpsEndpoint);
 }
diff --git a/infra/pulumi-infra-deploy/StackBuilders/StorageApi/StorageApiStackBuilder.cs b/infra/pulumi-infra-deploy/StackBuilders/StorageApi/StorageApiStackBuilder.cs
@@ -51,28 +51,28 @@ private ApiInfrastructure CreateApi(StorageInfrastructure storageInfra, string s
         Pulumi.Log.Info($"Using storage api js file from: {GlobalConfig.DeploymentPackagesConfig.StorageApiWorkerFilePath}");
 
         var name = $"{serviceName}-script";
-        var apiScript = new WorkerScript(name, new()
+        var apiScript = new WorkersScript(name, new()
         {
             AccountId = GlobalConfig.CloudflareConfig.AccountId,
-            Name = GlobalConfig.StorageApiConfig.ServiceName,
+            ScriptName = GlobalConfig.StorageApiConfig.ServiceName,
             Content = File.ReadAllText(GlobalConfig.DeploymentPackagesConfig.StorageApiWorkerFilePath),
-            Module = true,
-            R2BucketBindings = new[]
+            MainModule = name,
+            Bindings = new[]
             {
-                new Cloudflare.Inputs.WorkerScriptR2BucketBindingArgs
+                new Cloudflare.Inputs.WorkersScriptBindingArgs
                 {
                     Name = "STORAGE_BUCKET",
                     BucketName = storageInfra.Bucket.Name,
+                    Type = "r2_bucket"
                 },
-            },
-            SecretTextBindings = new[]
-            {
-                new Cloudflare.Inputs.WorkerScriptSecretTextBindingArgs
+                new Cloudflare.Inputs.WorkersScriptBindingArgs
                 {
                     Name = "ADMIN_TOKEN",
                     Text = adminAuthToken.Result,
+                    Type = "secret_text",
                 },
-            },
+            }
+
         }, new CustomResourceOptions
         {
             Provider = provider
@@ -85,12 +85,13 @@ private DomainInfrastructure GenerateDomainEntries(ApiInfrastructure apiInfra, s
     {
         var domainEndpoint = $"{GlobalConfig.StorageApiConfig.ServiceName}.{GlobalConfig.StorageApiConfig.ApiDomain}".ToLower();
 
-        var workerDomain = new WorkerDomain($"{serviceName}-worker-domain", new()
+        var workerDomain = new WorkersCustomDomain($"{serviceName}-worker-domain", new()
         {
             AccountId = GlobalConfig.CloudflareConfig.AccountId,
             ZoneId = GlobalConfig.StorageApiConfig.CloudflareZoneId,
-            Service = apiInfra.Script.Name,
-            Hostname = domainEndpoint
+            Service = apiInfra.Script.ScriptName,
+            Hostname = domainEndpoint,
+            Environment = "production"//We don't use cloudflare's environments, so just put "production" here because something is required
         }, new CustomResourceOptions
         {
             Provider = provider
diff --git a/infra/pulumi-infra-deploy/StackBuilders/Website/WebsiteInfrastructure.cs b/infra/pulumi-infra-deploy/StackBuilders/Website/WebsiteInfrastructure.cs
@@ -12,7 +12,7 @@ public record WebsiteInfrastructure(
     public record CloudflarePagesApp(Pulumi.Cloudflare.PagesProject PagesProject);
 
     public record DomainsInfrastructure(
-        Pulumi.Cloudflare.Record DomainRecord,
+        Pulumi.Cloudflare.DnsRecord DomainRecord,
         Pulumi.Cloudflare.PagesDomain PagesDomain,
         Output<string> FullEndpoint);
 }
diff --git a/infra/pulumi-infra-deploy/StackBuilders/Website/WebsiteStackBuilder.cs b/infra/pulumi-infra-deploy/StackBuilders/Website/WebsiteStackBuilder.cs
@@ -148,20 +148,19 @@ private DomainsInfrastructure GenerateDomainEntries(CloudflarePagesApp webClient
         var pagesDomain = new Cloudflare.PagesDomain("public-web-app-pages-domain", new()
         {
             AccountId = GlobalConfig.CloudflareConfig.AccountId,
-            Domain = pagesDomainEndpoint,
+            Name = pagesDomainEndpoint,
             ProjectName = webClientInfra.PagesProject.Name,
         }, new CustomResourceOptions
         {
             Provider = provider
         });
 
-        var record = new Cloudflare.Record("website-cname", new Cloudflare.RecordArgs
+        var record = new Cloudflare.DnsRecord("website-cname", new Cloudflare.DnsRecordArgs
         {
             Name = pagesDomainEndpoint,
-            Value = webClientInfra.PagesProject.Subdomain,
+            Content = webClientInfra.PagesProject.Subdomain,
             ZoneId = GlobalConfig.WebClientInfraConfig.CloudflareZoneId,
             Proxied = true,
-            AllowOverwrite = true,
             Type = "CNAME",
             Ttl = 1,//Has to be set to 1 because this is proxied
         }, new CustomResourceOptions
diff --git a/infra/pulumi-infra-deploy/Utilities/AzureUtilities.cs b/infra/pulumi-infra-deploy/Utilities/AzureUtilities.cs
@@ -8,7 +8,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using Pulumi.AzureNative.Resources;
-using Pulumi.AzureNative.Devices;
 using System.Collections.Immutable;
 using Pulumi.AzureAD.Outputs;
 
@@ -93,18 +92,6 @@ public static Output<string> GetBlobContainerUrl(BlobContainer container, Storag
         });
     }
 
-    public static Output<string> GetAzureIotHubOwnerConnectionString(ResourceGroup resourceGroup, Input<string> iotHubName)
-    {
-        return ListIotHubResourceKeysForKeyName.Invoke(
-            new ListIotHubResourceKeysForKeyNameInvokeArgs
-            {
-                KeyName = "iothubowner",
-                ResourceGroupName = resourceGroup.Name.Apply(x => x),
-                ResourceName = iotHubName
-            })
-            .Apply(x => Output.Format($"HostName={iotHubName.Apply(y => y)}.azure-devices.net;SharedAccessKeyName={x.KeyName};SharedAccessKey={x.PrimaryKey}"));
-    }
-
     public static string GenerateBlobFileResourceName(FileInfo file)
     {
         return file.FullName.Replace("\\", "_").Replace("/", "_").Replace(" ", "_");
diff --git a/infra/pulumi-infra-deploy/pulumi-infra-deploy.csproj b/infra/pulumi-infra-deploy/pulumi-infra-deploy.csproj
@@ -10,13 +10,13 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.13.1" />
+    <PackageReference Include="Azure.Identity" Version="1.14.0" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
-    <PackageReference Include="Pulumi.AzureNative" Version="2.74.0" />
-    <PackageReference Include="Pulumi.AzureAD" Version="6.0.1" />
-    <PackageReference Include="Pulumi.Cloudflare" Version="5.43.1" />
-    <PackageReference Include="Pulumi.Command" Version="1.0.1" />
-    <PackageReference Include="Pulumi.Random" Version="4.16.7" />
+    <PackageReference Include="Pulumi.AzureNative" Version="3.5.0" />
+    <PackageReference Include="Pulumi.AzureAD" Version="6.5.1" />
+    <PackageReference Include="Pulumi.Cloudflare" Version="6.2.1" />
+    <PackageReference Include="Pulumi.Command" Version="1.1.0" />
+    <PackageReference Include="Pulumi.Random" Version="4.18.2" />
   </ItemGroup>
   <PropertyGroup>
     <NuGetAudit>true</NuGetAudit>

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ public record RouteFilterInfrastructure(`
`11`	`11`	`{`
`12`	`12`
`13`	`13`	`public record WorkerInfrastructure(`
`14`		`- Cloudflare.WorkerScript Script, Cloudflare.WorkerRoute workerRoute);`
	`14`	`+ Cloudflare.WorkersScript Script, Cloudflare.WorkersRoute workerRoute);`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public record WebsiteInfrastructure(`
`12`	`12`	`public record CloudflarePagesApp(Pulumi.Cloudflare.PagesProject PagesProject);`
`13`	`13`
`14`	`14`	`public record DomainsInfrastructure(`
`15`		`- Pulumi.Cloudflare.Record DomainRecord,`
	`15`	`+ Pulumi.Cloudflare.DnsRecord DomainRecord,`
`16`	`16`	`Pulumi.Cloudflare.PagesDomain PagesDomain,`
`17`	`17`	`Output<string> FullEndpoint);`
`18`	`18`	`}`