Handle empty args in .NET SDK

pulumi · Feb 14, 2020 · 9e4630b · 9e4630b
1 parent d34873c
commit 9e4630b
Show file tree

Hide file tree

Showing 190 changed files with 754 additions and 940 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Bug fixes
 
 -   Fix aliases for several resource kinds. (https://github.com/pulumi/pulumi-kubernetes/pull/990).
+-   Fix .NET resources with empty arguments. (https://github.com/pulumi/pulumi-kubernetes/pull/983).
 
 ## 1.5.3 (February 11, 2020)
 

diff --git a/pkg/gen/dotnet-templates/kind.cs.mustache b/pkg/gen/dotnet-templates/kind.cs.mustache
@@ -32,11 +32,10 @@ namespace Pulumi.Kubernetes.{{Group}}.{{Version}}
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.{{Group}}.{{Version}}.{{Kind}}Args? args)
         {
-            if (args != null) {
-                args.ApiVersion = "{{RawAPIVersion}}";
-                args.Kind = "{{Kind}}";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.{{Group}}.{{Version}}.{{Kind}}Args();
+            args.ApiVersion = "{{RawAPIVersion}}";
+            args.Kind = "{{Kind}}";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/AdmissionRegistration/V1/MutatingWebhookConfiguration.cs b/sdk/dotnet/AdmissionRegistration/V1/MutatingWebhookConfiguration.cs
@@ -58,11 +58,10 @@ public MutatingWebhookConfiguration(string name, Types.Inputs.AdmissionRegistrat
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistration.V1.MutatingWebhookConfigurationArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "admissionregistration.k8s.io/v1";
-                args.Kind = "MutatingWebhookConfiguration";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.AdmissionRegistration.V1.MutatingWebhookConfigurationArgs();
+            args.ApiVersion = "admissionregistration.k8s.io/v1";
+            args.Kind = "MutatingWebhookConfiguration";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/AdmissionRegistration/V1/MutatingWebhookConfigurationList.cs b/sdk/dotnet/AdmissionRegistration/V1/MutatingWebhookConfigurationList.cs
@@ -57,11 +57,10 @@ public MutatingWebhookConfigurationList(string name, Types.Inputs.AdmissionRegis
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistration.V1.MutatingWebhookConfigurationListArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "admissionregistration.k8s.io/v1";
-                args.Kind = "MutatingWebhookConfigurationList";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.AdmissionRegistration.V1.MutatingWebhookConfigurationListArgs();
+            args.ApiVersion = "admissionregistration.k8s.io/v1";
+            args.Kind = "MutatingWebhookConfigurationList";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/AdmissionRegistration/V1/ValidatingWebhookConfiguration.cs b/sdk/dotnet/AdmissionRegistration/V1/ValidatingWebhookConfiguration.cs
@@ -58,11 +58,10 @@ public ValidatingWebhookConfiguration(string name, Types.Inputs.AdmissionRegistr
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistration.V1.ValidatingWebhookConfigurationArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "admissionregistration.k8s.io/v1";
-                args.Kind = "ValidatingWebhookConfiguration";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.AdmissionRegistration.V1.ValidatingWebhookConfigurationArgs();
+            args.ApiVersion = "admissionregistration.k8s.io/v1";
+            args.Kind = "ValidatingWebhookConfiguration";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/AdmissionRegistration/V1/ValidatingWebhookConfigurationList.cs b/sdk/dotnet/AdmissionRegistration/V1/ValidatingWebhookConfigurationList.cs
@@ -57,11 +57,10 @@ public ValidatingWebhookConfigurationList(string name, Types.Inputs.AdmissionReg
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistration.V1.ValidatingWebhookConfigurationListArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "admissionregistration.k8s.io/v1";
-                args.Kind = "ValidatingWebhookConfigurationList";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.AdmissionRegistration.V1.ValidatingWebhookConfigurationListArgs();
+            args.ApiVersion = "admissionregistration.k8s.io/v1";
+            args.Kind = "ValidatingWebhookConfigurationList";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/AdmissionRegistration/V1Beta1/MutatingWebhookConfiguration.cs b/sdk/dotnet/AdmissionRegistration/V1Beta1/MutatingWebhookConfiguration.cs
@@ -59,11 +59,10 @@ public MutatingWebhookConfiguration(string name, Types.Inputs.AdmissionRegistrat
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistration.V1Beta1.MutatingWebhookConfigurationArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "admissionregistration.k8s.io/v1beta1";
-                args.Kind = "MutatingWebhookConfiguration";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.AdmissionRegistration.V1Beta1.MutatingWebhookConfigurationArgs();
+            args.ApiVersion = "admissionregistration.k8s.io/v1beta1";
+            args.Kind = "MutatingWebhookConfiguration";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/AdmissionRegistration/V1Beta1/MutatingWebhookConfigurationList.cs b/sdk/dotnet/AdmissionRegistration/V1Beta1/MutatingWebhookConfigurationList.cs
@@ -57,11 +57,10 @@ public MutatingWebhookConfigurationList(string name, Types.Inputs.AdmissionRegis
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistration.V1Beta1.MutatingWebhookConfigurationListArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "admissionregistration.k8s.io/v1beta1";
-                args.Kind = "MutatingWebhookConfigurationList";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.AdmissionRegistration.V1Beta1.MutatingWebhookConfigurationListArgs();
+            args.ApiVersion = "admissionregistration.k8s.io/v1beta1";
+            args.Kind = "MutatingWebhookConfigurationList";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/AdmissionRegistration/V1Beta1/ValidatingWebhookConfiguration.cs b/sdk/dotnet/AdmissionRegistration/V1Beta1/ValidatingWebhookConfiguration.cs
@@ -59,11 +59,10 @@ public ValidatingWebhookConfiguration(string name, Types.Inputs.AdmissionRegistr
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistration.V1Beta1.ValidatingWebhookConfigurationArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "admissionregistration.k8s.io/v1beta1";
-                args.Kind = "ValidatingWebhookConfiguration";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.AdmissionRegistration.V1Beta1.ValidatingWebhookConfigurationArgs();
+            args.ApiVersion = "admissionregistration.k8s.io/v1beta1";
+            args.Kind = "ValidatingWebhookConfiguration";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/AdmissionRegistration/V1Beta1/ValidatingWebhookConfigurationList.cs b/sdk/dotnet/AdmissionRegistration/V1Beta1/ValidatingWebhookConfigurationList.cs
@@ -57,11 +57,10 @@ public ValidatingWebhookConfigurationList(string name, Types.Inputs.AdmissionReg
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistration.V1Beta1.ValidatingWebhookConfigurationListArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "admissionregistration.k8s.io/v1beta1";
-                args.Kind = "ValidatingWebhookConfigurationList";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.AdmissionRegistration.V1Beta1.ValidatingWebhookConfigurationListArgs();
+            args.ApiVersion = "admissionregistration.k8s.io/v1beta1";
+            args.Kind = "ValidatingWebhookConfigurationList";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/ApiExtensions/V1/CustomResourceDefinition.cs b/sdk/dotnet/ApiExtensions/V1/CustomResourceDefinition.cs
@@ -61,11 +61,10 @@ public CustomResourceDefinition(string name, Types.Inputs.ApiExtensions.V1.Custo
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiExtensions.V1.CustomResourceDefinitionArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apiextensions.k8s.io/v1";
-                args.Kind = "CustomResourceDefinition";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.ApiExtensions.V1.CustomResourceDefinitionArgs();
+            args.ApiVersion = "apiextensions.k8s.io/v1";
+            args.Kind = "CustomResourceDefinition";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/ApiExtensions/V1/CustomResourceDefinitionList.cs b/sdk/dotnet/ApiExtensions/V1/CustomResourceDefinitionList.cs
@@ -54,11 +54,10 @@ public CustomResourceDefinitionList(string name, Types.Inputs.ApiExtensions.V1.C
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiExtensions.V1.CustomResourceDefinitionListArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apiextensions.k8s.io/v1";
-                args.Kind = "CustomResourceDefinitionList";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.ApiExtensions.V1.CustomResourceDefinitionListArgs();
+            args.ApiVersion = "apiextensions.k8s.io/v1";
+            args.Kind = "CustomResourceDefinitionList";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/ApiExtensions/V1Beta1/CustomResourceDefinition.cs b/sdk/dotnet/ApiExtensions/V1Beta1/CustomResourceDefinition.cs
@@ -63,11 +63,10 @@ public CustomResourceDefinition(string name, Types.Inputs.ApiExtensions.V1Beta1.
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiExtensions.V1Beta1.CustomResourceDefinitionArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apiextensions.k8s.io/v1beta1";
-                args.Kind = "CustomResourceDefinition";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.ApiExtensions.V1Beta1.CustomResourceDefinitionArgs();
+            args.ApiVersion = "apiextensions.k8s.io/v1beta1";
+            args.Kind = "CustomResourceDefinition";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/ApiExtensions/V1Beta1/CustomResourceDefinitionList.cs b/sdk/dotnet/ApiExtensions/V1Beta1/CustomResourceDefinitionList.cs
@@ -54,11 +54,10 @@ public CustomResourceDefinitionList(string name, Types.Inputs.ApiExtensions.V1Be
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiExtensions.V1Beta1.CustomResourceDefinitionListArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apiextensions.k8s.io/v1beta1";
-                args.Kind = "CustomResourceDefinitionList";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.ApiExtensions.V1Beta1.CustomResourceDefinitionListArgs();
+            args.ApiVersion = "apiextensions.k8s.io/v1beta1";
+            args.Kind = "CustomResourceDefinitionList";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/ApiRegistration/V1/APIService.cs b/sdk/dotnet/ApiRegistration/V1/APIService.cs
@@ -60,11 +60,10 @@ public APIService(string name, Types.Inputs.ApiRegistration.V1.APIServiceArgs? a
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiRegistration.V1.APIServiceArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apiregistration.k8s.io/v1";
-                args.Kind = "APIService";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.ApiRegistration.V1.APIServiceArgs();
+            args.ApiVersion = "apiregistration.k8s.io/v1";
+            args.Kind = "APIService";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/ApiRegistration/V1/APIServiceList.cs b/sdk/dotnet/ApiRegistration/V1/APIServiceList.cs
@@ -52,11 +52,10 @@ public APIServiceList(string name, Types.Inputs.ApiRegistration.V1.APIServiceLis
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiRegistration.V1.APIServiceListArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apiregistration.k8s.io/v1";
-                args.Kind = "APIServiceList";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.ApiRegistration.V1.APIServiceListArgs();
+            args.ApiVersion = "apiregistration.k8s.io/v1";
+            args.Kind = "APIServiceList";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/ApiRegistration/V1Beta1/APIService.cs b/sdk/dotnet/ApiRegistration/V1Beta1/APIService.cs
@@ -60,11 +60,10 @@ public APIService(string name, Types.Inputs.ApiRegistration.V1Beta1.APIServiceAr
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiRegistration.V1Beta1.APIServiceArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apiregistration.k8s.io/v1beta1";
-                args.Kind = "APIService";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.ApiRegistration.V1Beta1.APIServiceArgs();
+            args.ApiVersion = "apiregistration.k8s.io/v1beta1";
+            args.Kind = "APIService";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/ApiRegistration/V1Beta1/APIServiceList.cs b/sdk/dotnet/ApiRegistration/V1Beta1/APIServiceList.cs
@@ -52,11 +52,10 @@ public APIServiceList(string name, Types.Inputs.ApiRegistration.V1Beta1.APIServi
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiRegistration.V1Beta1.APIServiceListArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apiregistration.k8s.io/v1beta1";
-                args.Kind = "APIServiceList";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.ApiRegistration.V1Beta1.APIServiceListArgs();
+            args.ApiVersion = "apiregistration.k8s.io/v1beta1";
+            args.Kind = "APIServiceList";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/Apps/V1/ControllerRevision.cs b/sdk/dotnet/Apps/V1/ControllerRevision.cs
@@ -70,11 +70,10 @@ public ControllerRevision(string name, Types.Inputs.Apps.V1.ControllerRevisionAr
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Apps.V1.ControllerRevisionArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apps/v1";
-                args.Kind = "ControllerRevision";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.Apps.V1.ControllerRevisionArgs();
+            args.ApiVersion = "apps/v1";
+            args.Kind = "ControllerRevision";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/Apps/V1/ControllerRevisionList.cs b/sdk/dotnet/Apps/V1/ControllerRevisionList.cs
@@ -57,11 +57,10 @@ public ControllerRevisionList(string name, Types.Inputs.Apps.V1.ControllerRevisi
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Apps.V1.ControllerRevisionListArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apps/v1";
-                args.Kind = "ControllerRevisionList";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.Apps.V1.ControllerRevisionListArgs();
+            args.ApiVersion = "apps/v1";
+            args.Kind = "ControllerRevisionList";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/Apps/V1/DaemonSet.cs b/sdk/dotnet/Apps/V1/DaemonSet.cs
@@ -66,11 +66,10 @@ public DaemonSet(string name, Types.Inputs.Apps.V1.DaemonSetArgs? args = null, C
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Apps.V1.DaemonSetArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apps/v1";
-                args.Kind = "DaemonSet";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.Apps.V1.DaemonSetArgs();
+            args.ApiVersion = "apps/v1";
+            args.Kind = "DaemonSet";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/Apps/V1/DaemonSetList.cs b/sdk/dotnet/Apps/V1/DaemonSetList.cs
@@ -57,11 +57,10 @@ public DaemonSetList(string name, Types.Inputs.Apps.V1.DaemonSetListArgs? args =
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Apps.V1.DaemonSetListArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apps/v1";
-                args.Kind = "DaemonSetList";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.Apps.V1.DaemonSetListArgs();
+            args.ApiVersion = "apps/v1";
+            args.Kind = "DaemonSetList";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/Apps/V1/Deployment.cs b/sdk/dotnet/Apps/V1/Deployment.cs
@@ -86,11 +86,10 @@ public Deployment(string name, Types.Inputs.Apps.V1.DeploymentArgs? args = null,
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Apps.V1.DeploymentArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apps/v1";
-                args.Kind = "Deployment";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.Apps.V1.DeploymentArgs();
+            args.ApiVersion = "apps/v1";
+            args.Kind = "Deployment";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/Apps/V1/DeploymentList.cs b/sdk/dotnet/Apps/V1/DeploymentList.cs
@@ -56,11 +56,10 @@ public DeploymentList(string name, Types.Inputs.Apps.V1.DeploymentListArgs? args
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Apps.V1.DeploymentListArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apps/v1";
-                args.Kind = "DeploymentList";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.Apps.V1.DeploymentListArgs();
+            args.ApiVersion = "apps/v1";
+            args.Kind = "DeploymentList";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)

diff --git a/sdk/dotnet/Apps/V1/ReplicaSet.cs b/sdk/dotnet/Apps/V1/ReplicaSet.cs
@@ -67,11 +67,10 @@ public ReplicaSet(string name, Types.Inputs.Apps.V1.ReplicaSetArgs? args = null,
 
         private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.Apps.V1.ReplicaSetArgs? args)
         {
-            if (args != null) {
-                args.ApiVersion = "apps/v1";
-                args.Kind = "ReplicaSet";
-            }
-            return args ?? ResourceArgs.Empty;
+            args ??= new Types.Inputs.Apps.V1.ReplicaSetArgs();
+            args.ApiVersion = "apps/v1";
+            args.Kind = "ReplicaSet";
+            return args;
         }
 
         private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions? options)