Upgraded packages

UbiquitousLanguage · Mar 23, 2022 · c0a589f · c0a589f
1 parent fd9dde8
commit c0a589f
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 57 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -18,8 +18,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="All"/>
-        <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" PrivateAssets="All"/>
+        <PackageReference Include="MinVer" Version="3.1.0" PrivateAssets="All"/>
+        <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Ubiquitous.AutoDevOps.Automation/Ubiquitous.AutoDevOps.Automation.csproj b/Ubiquitous.AutoDevOps.Automation/Ubiquitous.AutoDevOps.Automation.csproj
@@ -5,12 +5,12 @@
 
     <ItemGroup>
         <PackageReference Include="ConsoleTableExt" Version="3.1.9" />
-        <PackageReference Include="Pulumi.Automation" Version="3.17.0" />
+        <PackageReference Include="Pulumi.Automation" Version="3.26.1" />
         <PackageReference Include="Serilog" Version="2.10.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
         <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="all" />
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21216.1" />
-        <PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
+        <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Ubiquitous.AutoDevOps.Crds.CertManager/Ubiquitous.AutoDevOps.Crds.CertManager.csproj b/Ubiquitous.AutoDevOps.Crds.CertManager/Ubiquitous.AutoDevOps.Crds.CertManager.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <PackageReference Include="Pulumi.Kubernetes" Version="3.*" ExcludeAssets="contentFiles" />
+        <PackageReference Include="Pulumi.Kubernetes" Version="3.17.0" ExcludeAssets="contentFiles" />
     </ItemGroup>
 </Project>
diff --git a/Ubiquitous.AutoDevOps.Crds.Prometheus/Ubiquitous.AutoDevOps.Crds.Prometheus.csproj b/Ubiquitous.AutoDevOps.Crds.Prometheus/Ubiquitous.AutoDevOps.Crds.Prometheus.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <PackageReference Include="Pulumi.Kubernetes" Version="3.*" ExcludeAssets="contentFiles" />
+        <PackageReference Include="Pulumi.Kubernetes" Version="3.17.0" ExcludeAssets="contentFiles" />
     </ItemGroup>
 </Project>
diff --git a/Ubiquitous.AutoDevOps.Crds.Traefik/Ubiquitous.AutoDevOps.Crds.Traefik.csproj b/Ubiquitous.AutoDevOps.Crds.Traefik/Ubiquitous.AutoDevOps.Crds.Traefik.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <PackageReference Include="Pulumi.Kubernetes" Version="3.*" ExcludeAssets="contentFiles" />
+        <PackageReference Include="Pulumi.Kubernetes" Version="3.17.0" ExcludeAssets="contentFiles" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\Ubiquitous.AutoDevOps.Stack\Ubiquitous.AutoDevOps.Stack.csproj" />

diff --git a/Ubiquitous.AutoDevOps.Stack/Factories/Pods.cs b/Ubiquitous.AutoDevOps.Stack/Factories/Pods.cs
@@ -31,7 +31,7 @@ public static List<ContainerArgs> GetAppContainers(
                 appSettings.PortName,
                 (c, p) =>
                     c.Ports = new[] {
-                        new ContainerPortArgs {Name = p, ContainerPortValue = appSettings.Port}
+                        new ContainerPortArgs { Name = p, ContainerPortValue = appSettings.Port }
                     }
             )
             .When(
@@ -47,7 +47,7 @@ public static List<ContainerArgs> GetAppContainers(
                 appSecret,
                 (c, s) =>
                     c.EnvFrom = new EnvFromSourceArgs {
-                        SecretRef = new SecretEnvSourceArgs {Name = s.Metadata.Apply(x => x.Name)}
+                        SecretRef = new SecretEnvSourceArgs { Name = s.Metadata.Apply(x => x.Name) }
                     }
             )
             .WhenNotEmptyString(
@@ -63,7 +63,7 @@ public static List<ContainerArgs> GetAppContainers(
 
         configureContainer?.Invoke(container);
 
-        var containers = new List<ContainerArgs> {container};
+        var containers = new List<ContainerArgs> { container };
         if (sidecars != null) containers.AddRange(sidecars);
 
         return containers;
@@ -103,8 +103,8 @@ public static PodTemplateSpecArgs GetPodTemplate(
     /// <returns></returns>
     public static InputMap<string> Resource(string cpu, string memory)
         => new() {
-            {"cpu", cpu},
-            {"memory", memory}
+            { "cpu", cpu },
+            { "memory", memory }
         };
 
     /// <summary>
@@ -124,18 +124,18 @@ public static InputMap<string> Resource(string cpu, string memory)
     public static InputList<LocalObjectReferenceArgs> ImagePullSecrets(params Output<string>?[] imagePullSecrets)
         => imagePullSecrets
             .Where(x => x != null)
-            .Select(x => new LocalObjectReferenceArgs {Name = x!})
+            .Select(x => new LocalObjectReferenceArgs { Name = x! })
             .ToArray();
 
-    public static EnvVarArgs EnvVar(string name, string value) => new() {Name = name, Value = value};
+    public static EnvVarArgs EnvVar(string name, string value) => new() { Name = name, Value = value };
 
     public static VolumeMountArgs VolumeMount(string name, string mountPath)
-        => new() {Name = name, MountPath = mountPath};
-        
+        => new() { Name = name, MountPath = mountPath };
+
     public static EnvVarArgs FieldFrom(string envName, string field)
         => new() {
             Name      = envName,
-            ValueFrom = new EnvVarSourceArgs {FieldRef = new ObjectFieldSelectorArgs {FieldPath = field}}
+            ValueFrom = new EnvVarSourceArgs { FieldRef = new ObjectFieldSelectorArgs { FieldPath = field } }
         };
 
     /// <summary>

diff --git a/Ubiquitous.AutoDevOps.Stack/Resources/KubeCronJob.cs b/Ubiquitous.AutoDevOps.Stack/Resources/KubeCronJob.cs
@@ -1,4 +1,5 @@
 using JetBrains.Annotations;
+using Pulumi;
 using Pulumi.Kubernetes.Batch.V1Beta1;
 using Pulumi.Kubernetes.Core.V1;
 using Pulumi.Kubernetes.Types.Inputs.Batch.V1;
@@ -9,7 +10,7 @@
 using CronJobSpecArgs = Pulumi.Kubernetes.Types.Inputs.Batch.V1Beta1.CronJobSpecArgs;
 using JobTemplateSpecArgs = Pulumi.Kubernetes.Types.Inputs.Batch.V1Beta1.JobTemplateSpecArgs;
 
-namespace Ubiquitous.AutoDevOps.Stack.Resources; 
+namespace Ubiquitous.AutoDevOps.Stack.Resources;
 
 [PublicAPI]
 public class KubeCronJob {
@@ -23,7 +24,8 @@ public static CronJob Create(
         Secret                 imagePullSecret,
         Secret?                appSecret,
         Action<ContainerArgs>? configureContainer = null,
-        Action<PodSpecArgs>?   configurePod       = null
+        Action<PodSpecArgs>?   configurePod       = null,
+        ProviderResource?      providerResource   = null
     ) {
         var appLabels         = Meta.AppLabels(appSettings, resourceName, deploySettings.Release);
         var gitLabAnnotations = gitLabSettings.GitLabAnnotations();
@@ -64,7 +66,8 @@ public static CronJob Create(
                         Spec = new JobSpecArgs { Template = podTemplate }
                     }
                 }
-            }
+            },
+            providerResource.AsResourceOptions()
         );
     }
 }
diff --git a/Ubiquitous.AutoDevOps.Stack/Resources/KubeDeployment.cs b/Ubiquitous.AutoDevOps.Stack/Resources/KubeDeployment.cs
@@ -7,7 +7,7 @@
 using static Ubiquitous.AutoDevOps.Stack.AutoDevOpsSettings;
 using Deployment = Pulumi.Kubernetes.Apps.V1.Deployment;
 
-namespace Ubiquitous.AutoDevOps.Stack.Resources; 
+namespace Ubiquitous.AutoDevOps.Stack.Resources;
 
 public static class KubeDeployment {
     public static Deployment Create(
@@ -55,10 +55,6 @@ public static Deployment Create(
         };
         configureDeployment?.Invoke(deployment);
 
-        return new Deployment(
-            resourceName.AsPulumiName(),
-            deployment,
-            new CustomResourceOptions { Provider = providerResource }
-        );
+        return new Deployment(resourceName.AsPulumiName(), deployment, providerResource.AsResourceOptions());
     }
 }
diff --git a/Ubiquitous.AutoDevOps.Stack/Resources/KubeIngress.cs b/Ubiquitous.AutoDevOps.Stack/Resources/KubeIngress.cs
@@ -58,10 +58,6 @@ public static Ingress Create(
             }
         };
 
-        return new Ingress(
-            resourceName.AsPulumiName(),
-            ingress,
-            new CustomResourceOptions { Provider = providerResource }
-        );
+        return new Ingress(resourceName.AsPulumiName(), ingress, providerResource.AsResourceOptions());
     }
 }
diff --git a/Ubiquitous.AutoDevOps.Stack/Resources/KubeNamespace.cs b/Ubiquitous.AutoDevOps.Stack/Resources/KubeNamespace.cs
@@ -15,14 +15,38 @@ public static class KubeNamespace {
     /// <returns></returns>
     public static Namespace Create(
         string name, Dictionary<string, string>? annotations = null, ProviderResource? providerResource = null
-    ) {
-        var namespaceAnnotations = (annotations ?? new Dictionary<string, string>())
-            .AsInputMap();
-
-        return new Namespace(
+    )
+        => new(
             name,
-            new NamespaceArgs { Metadata = new ObjectMetaArgs { Name = name, Annotations = namespaceAnnotations } },
-            new CustomResourceOptions { Provider = providerResource }
+            new NamespaceBuilder(name).WithAnnotations(annotations).Build(),
+            providerResource.AsResourceOptions()
         );
+}
+
+public class NamespaceBuilder {
+    readonly ObjectMetaArgs _meta = new();
+
+    public NamespaceBuilder(string name) => _meta.Name = name;
+
+    public NamespaceBuilder WithAnnotations(Dictionary<string, string>? annotations) {
+        if (annotations != null) _meta.Annotations = annotations;
+        return this;
+    }
+
+    public NamespaceBuilder WithLabels(Dictionary<string, string>? labels) {
+        if (labels != null) _meta.Labels = labels;
+        return this;
+    }
+
+    public NamespaceBuilder ConfigureMeta(Action<ObjectMetaArgs> configure) {
+        configure(_meta);
+        return this;
     }
+
+    public NamespaceArgs Build() => new() { Metadata = _meta };
+}
+
+public static class ProviderExtensions {
+    public static CustomResourceOptions? AsResourceOptions(this ProviderResource? providerResource)
+        => providerResource == null ? null : new CustomResourceOptions();
 }
diff --git a/Ubiquitous.AutoDevOps.Stack/Resources/KubeSecret.cs b/Ubiquitous.AutoDevOps.Stack/Resources/KubeSecret.cs
@@ -23,7 +23,7 @@ public static class KubeSecret {
         Namespace                   @namespace,
         ResourceName                resourceName,
         AutoDevOpsSettings          settings,
-        Dictionary<string, string>? extraData = null,
+        Dictionary<string, string>? extraData        = null,
         ProviderResource?           providerResource = null
     ) {
         var env = GetEnvironmentVariables();
@@ -60,7 +60,7 @@ public static class KubeSecret {
                 Type       = "opaque",
                 StringData = vars
             },
-            new CustomResourceOptions { Provider = providerResource }
+            providerResource.AsResourceOptions()
         );
     }
 
@@ -85,7 +85,7 @@ public static Secret CreateAppSecret(
                 Type       = "opaque",
                 StringData = variables
             },
-            new CustomResourceOptions { Provider = providerResource }
+            providerResource.AsResourceOptions()
         );
 
     /// <summary>
@@ -115,9 +115,7 @@ public static Secret CreateRegistrySecret(
                 Type     = "kubernetes.io/dockerconfigjson",
                 Data     = new InputMap<string> { { ".dockerconfigjson", content } }
             },
-            new CustomResourceOptions {
-                Provider = providerResource
-            }
+            providerResource.AsResourceOptions()
         );
     }
 }
diff --git a/Ubiquitous.AutoDevOps.Stack/Resources/KubeService.cs b/Ubiquitous.AutoDevOps.Stack/Resources/KubeService.cs
@@ -5,7 +5,7 @@
 using Ubiquitous.AutoDevOps.Stack.Factories;
 using static Ubiquitous.AutoDevOps.Stack.AutoDevOpsSettings;
 
-namespace Ubiquitous.AutoDevOps.Stack.Resources; 
+namespace Ubiquitous.AutoDevOps.Stack.Resources;
 
 [PublicAPI]
 public static class KubeService {
@@ -118,10 +118,6 @@ public static Service Create(
             };
         configureService?.Invoke(serviceArgs);
 
-        return new Service(
-            resourceName.AsPulumiName(),
-            serviceArgs,
-            new CustomResourceOptions {Provider = providerResource}
-        );
+        return new Service(resourceName.AsPulumiName(), serviceArgs, providerResource.AsResourceOptions());
     }
 }
diff --git a/Ubiquitous.AutoDevOps.Stack/Resources/KubeStatefulSet.cs b/Ubiquitous.AutoDevOps.Stack/Resources/KubeStatefulSet.cs
@@ -1,4 +1,3 @@
-using System;
 using JetBrains.Annotations;
 using Pulumi;
 using Pulumi.Kubernetes.Apps.V1;
@@ -65,10 +64,6 @@ public static StatefulSet Create(
         };
         configureStatefulSet?.Invoke(statefulSetArgs);
 
-        return new StatefulSet(
-            resourceName.AsPulumiName(),
-            statefulSetArgs,
-            new CustomResourceOptions { Provider = providerResource }
-        );
+        return new StatefulSet(resourceName.AsPulumiName(), statefulSetArgs, providerResource.AsResourceOptions());
     }
 }
diff --git a/Ubiquitous.AutoDevOps.Stack/Ubiquitous.AutoDevOps.Stack.csproj b/Ubiquitous.AutoDevOps.Stack/Ubiquitous.AutoDevOps.Stack.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="Pulumi.Kubernetes" Version="3.9.0" />
+    <PackageReference Include="Pulumi.Kubernetes" Version="3.17.0" />
   </ItemGroup>
 
   <ItemGroup>