Add type aliases and secret outputs to .NET resources (#1026)

Add type aliases and secret outputs to .NET resources

CHANGELOG.md

@@ -3,6 +3,11 @@
 
 ## 1.5.7 (March 10, 2020)
 
+### Improvements
+
+- Automatically populate type aliases and additional secret outputs in the .NET SDK.
+  (https://github.com/pulumi/pulumi-kubernetes/pull/1026).  
+
 ### Bug fixes
 
 -   Replace PersistentVolume if volume source changes. (https://github.com/pulumi/pulumi-kubernetes/pull/1015).

pkg/gen/dotnet-templates/kind.cs.mustache

@@ -26,7 +26,7 @@ namespace Pulumi.Kubernetes.{{Group}}.{{Version}}
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public {{Kind}}(string name, Types.Inputs.{{Group}}.{{Version}}.{{Kind}}Args? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:{{URNAPIVersion}}:{{Kind}}", name, SetAPIKindAndVersion(args), options)
+            : base("kubernetes:{{URNAPIVersion}}:{{Kind}}", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
@@ -43,6 +43,36 @@ namespace Pulumi.Kubernetes.{{Group}}.{{Version}}
             return args;
         }
 
+        private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
+        {
+            {{#MergeOptsRequired}}
+            var extraOptions = new CustomResourceOptions
+            {
+                {{#AdditionalSecretOutputsPresent}}
+                AdditionalSecretOutputs =
+                {
+                    {{#AdditionalSecretOutputs}}
+                    "{{.}}",
+                    {{/AdditionalSecretOutputs}}
+                },
+                {{/AdditionalSecretOutputsPresent}}
+                {{#AliasesPresent}}
+                Aliases =
+                {
+                    {{#Aliases}}
+                    new Alias { Type = "{{.}}" },
+                    {{/Aliases}}
+                }
+                {{/AliasesPresent}}
+            };
+
+            return CustomResourceOptions.Merge(options, extraOptions);
+            {{/MergeOptsRequired}}
+            {{^MergeOptsRequired}}
+            return options;
+            {{/MergeOptsRequired}}
+        }
+
         /// <summary>
         /// Get an existing {{Kind}} resource's state with the given name and ID.
         /// </summary>
@@ -54,6 +84,5 @@ namespace Pulumi.Kubernetes.{{Group}}.{{Version}}
             return new {{Kind}}(name, default(Types.Inputs.{{Group}}.{{Version}}.{{Kind}}Args),
                 CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
         }
-
     }
 }

sdk/dotnet/AdmissionRegistration/V1/MutatingWebhookConfiguration.cs

@@ -52,7 +52,7 @@ public partial class MutatingWebhookConfiguration : KubernetesResource
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public MutatingWebhookConfiguration(string name, Types.Inputs.AdmissionRegistration.V1.MutatingWebhookConfigurationArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfiguration", name, SetAPIKindAndVersion(args), options)
+            : base("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfiguration", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
@@ -69,6 +69,19 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistrat
             return args;
         }
 
+        private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
+        {
+            var extraOptions = new CustomResourceOptions
+            {
+                Aliases =
+                {
+                    new Alias { Type = "kubernetes:admissionregistration.k8s.io/v1beta1:MutatingWebhookConfiguration" },
+                }
+            };
+
+            return CustomResourceOptions.Merge(options, extraOptions);
+        }
+
         /// <summary>
         /// Get an existing MutatingWebhookConfiguration resource's state with the given name and ID.
         /// </summary>
@@ -80,6 +93,5 @@ public static MutatingWebhookConfiguration Get(string name, Input<string> id, Cu
             return new MutatingWebhookConfiguration(name, default(Types.Inputs.AdmissionRegistration.V1.MutatingWebhookConfigurationArgs),
                 CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
         }
-
     }
 }

sdk/dotnet/AdmissionRegistration/V1/MutatingWebhookConfigurationList.cs

@@ -51,7 +51,7 @@ public partial class MutatingWebhookConfigurationList : KubernetesResource
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public MutatingWebhookConfigurationList(string name, Types.Inputs.AdmissionRegistration.V1.MutatingWebhookConfigurationListArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfigurationList", name, SetAPIKindAndVersion(args), options)
+            : base("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfigurationList", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
@@ -68,6 +68,11 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistrat
             return args;
         }
 
+        private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
+        {
+            return options;
+        }
+
         /// <summary>
         /// Get an existing MutatingWebhookConfigurationList resource's state with the given name and ID.
         /// </summary>
@@ -79,6 +84,5 @@ public static MutatingWebhookConfigurationList Get(string name, Input<string> id
             return new MutatingWebhookConfigurationList(name, default(Types.Inputs.AdmissionRegistration.V1.MutatingWebhookConfigurationListArgs),
                 CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
         }
-
     }
 }

sdk/dotnet/AdmissionRegistration/V1/ValidatingWebhookConfiguration.cs

@@ -52,7 +52,7 @@ public partial class ValidatingWebhookConfiguration : KubernetesResource
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public ValidatingWebhookConfiguration(string name, Types.Inputs.AdmissionRegistration.V1.ValidatingWebhookConfigurationArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:admissionregistration.k8s.io/v1:ValidatingWebhookConfiguration", name, SetAPIKindAndVersion(args), options)
+            : base("kubernetes:admissionregistration.k8s.io/v1:ValidatingWebhookConfiguration", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
@@ -69,6 +69,19 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistrat
             return args;
         }
 
+        private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
+        {
+            var extraOptions = new CustomResourceOptions
+            {
+                Aliases =
+                {
+                    new Alias { Type = "kubernetes:admissionregistration.k8s.io/v1beta1:ValidatingWebhookConfiguration" },
+                }
+            };
+
+            return CustomResourceOptions.Merge(options, extraOptions);
+        }
+
         /// <summary>
         /// Get an existing ValidatingWebhookConfiguration resource's state with the given name and ID.
         /// </summary>
@@ -80,6 +93,5 @@ public static ValidatingWebhookConfiguration Get(string name, Input<string> id,
             return new ValidatingWebhookConfiguration(name, default(Types.Inputs.AdmissionRegistration.V1.ValidatingWebhookConfigurationArgs),
                 CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
         }
-
     }
 }

sdk/dotnet/AdmissionRegistration/V1/ValidatingWebhookConfigurationList.cs

@@ -51,7 +51,7 @@ public partial class ValidatingWebhookConfigurationList : KubernetesResource
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public ValidatingWebhookConfigurationList(string name, Types.Inputs.AdmissionRegistration.V1.ValidatingWebhookConfigurationListArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:admissionregistration.k8s.io/v1:ValidatingWebhookConfigurationList", name, SetAPIKindAndVersion(args), options)
+            : base("kubernetes:admissionregistration.k8s.io/v1:ValidatingWebhookConfigurationList", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
@@ -68,6 +68,11 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistrat
             return args;
         }
 
+        private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
+        {
+            return options;
+        }
+
         /// <summary>
         /// Get an existing ValidatingWebhookConfigurationList resource's state with the given name and ID.
         /// </summary>
@@ -79,6 +84,5 @@ public static ValidatingWebhookConfigurationList Get(string name, Input<string>
             return new ValidatingWebhookConfigurationList(name, default(Types.Inputs.AdmissionRegistration.V1.ValidatingWebhookConfigurationListArgs),
                 CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
         }
-
     }
 }

sdk/dotnet/AdmissionRegistration/V1Beta1/MutatingWebhookConfiguration.cs

@@ -53,7 +53,7 @@ public partial class MutatingWebhookConfiguration : KubernetesResource
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public MutatingWebhookConfiguration(string name, Types.Inputs.AdmissionRegistration.V1Beta1.MutatingWebhookConfigurationArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:admissionregistration.k8s.io/v1beta1:MutatingWebhookConfiguration", name, SetAPIKindAndVersion(args), options)
+            : base("kubernetes:admissionregistration.k8s.io/v1beta1:MutatingWebhookConfiguration", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
@@ -70,6 +70,19 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistrat
             return args;
         }
 
+        private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
+        {
+            var extraOptions = new CustomResourceOptions
+            {
+                Aliases =
+                {
+                    new Alias { Type = "kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfiguration" },
+                }
+            };
+
+            return CustomResourceOptions.Merge(options, extraOptions);
+        }
+
         /// <summary>
         /// Get an existing MutatingWebhookConfiguration resource's state with the given name and ID.
         /// </summary>
@@ -81,6 +94,5 @@ public static MutatingWebhookConfiguration Get(string name, Input<string> id, Cu
             return new MutatingWebhookConfiguration(name, default(Types.Inputs.AdmissionRegistration.V1Beta1.MutatingWebhookConfigurationArgs),
                 CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
         }
-
     }
 }

sdk/dotnet/AdmissionRegistration/V1Beta1/MutatingWebhookConfigurationList.cs

@@ -51,7 +51,7 @@ public partial class MutatingWebhookConfigurationList : KubernetesResource
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public MutatingWebhookConfigurationList(string name, Types.Inputs.AdmissionRegistration.V1Beta1.MutatingWebhookConfigurationListArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:admissionregistration.k8s.io/v1beta1:MutatingWebhookConfigurationList", name, SetAPIKindAndVersion(args), options)
+            : base("kubernetes:admissionregistration.k8s.io/v1beta1:MutatingWebhookConfigurationList", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
@@ -68,6 +68,11 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistrat
             return args;
         }
 
+        private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
+        {
+            return options;
+        }
+
         /// <summary>
         /// Get an existing MutatingWebhookConfigurationList resource's state with the given name and ID.
         /// </summary>
@@ -79,6 +84,5 @@ public static MutatingWebhookConfigurationList Get(string name, Input<string> id
             return new MutatingWebhookConfigurationList(name, default(Types.Inputs.AdmissionRegistration.V1Beta1.MutatingWebhookConfigurationListArgs),
                 CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
         }
-
     }
 }

sdk/dotnet/AdmissionRegistration/V1Beta1/ValidatingWebhookConfiguration.cs

@@ -53,7 +53,7 @@ public partial class ValidatingWebhookConfiguration : KubernetesResource
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public ValidatingWebhookConfiguration(string name, Types.Inputs.AdmissionRegistration.V1Beta1.ValidatingWebhookConfigurationArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:admissionregistration.k8s.io/v1beta1:ValidatingWebhookConfiguration", name, SetAPIKindAndVersion(args), options)
+            : base("kubernetes:admissionregistration.k8s.io/v1beta1:ValidatingWebhookConfiguration", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
@@ -70,6 +70,19 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistrat
             return args;
         }
 
+        private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
+        {
+            var extraOptions = new CustomResourceOptions
+            {
+                Aliases =
+                {
+                    new Alias { Type = "kubernetes:admissionregistration.k8s.io/v1:ValidatingWebhookConfiguration" },
+                }
+            };
+
+            return CustomResourceOptions.Merge(options, extraOptions);
+        }
+
         /// <summary>
         /// Get an existing ValidatingWebhookConfiguration resource's state with the given name and ID.
         /// </summary>
@@ -81,6 +94,5 @@ public static ValidatingWebhookConfiguration Get(string name, Input<string> id,
             return new ValidatingWebhookConfiguration(name, default(Types.Inputs.AdmissionRegistration.V1Beta1.ValidatingWebhookConfigurationArgs),
                 CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
         }
-
     }
 }

sdk/dotnet/AdmissionRegistration/V1Beta1/ValidatingWebhookConfigurationList.cs

@@ -51,7 +51,7 @@ public partial class ValidatingWebhookConfigurationList : KubernetesResource
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public ValidatingWebhookConfigurationList(string name, Types.Inputs.AdmissionRegistration.V1Beta1.ValidatingWebhookConfigurationListArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:admissionregistration.k8s.io/v1beta1:ValidatingWebhookConfigurationList", name, SetAPIKindAndVersion(args), options)
+            : base("kubernetes:admissionregistration.k8s.io/v1beta1:ValidatingWebhookConfigurationList", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
@@ -68,6 +68,11 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.AdmissionRegistrat
             return args;
         }
 
+        private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
+        {
+            return options;
+        }
+
         /// <summary>
         /// Get an existing ValidatingWebhookConfigurationList resource's state with the given name and ID.
         /// </summary>
@@ -79,6 +84,5 @@ public static ValidatingWebhookConfigurationList Get(string name, Input<string>
             return new ValidatingWebhookConfigurationList(name, default(Types.Inputs.AdmissionRegistration.V1Beta1.ValidatingWebhookConfigurationListArgs),
                 CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
         }
-
     }
 }

sdk/dotnet/ApiExtensions/V1/CustomResourceDefinition.cs

@@ -55,7 +55,7 @@ public partial class CustomResourceDefinition : KubernetesResource
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public CustomResourceDefinition(string name, Types.Inputs.ApiExtensions.V1.CustomResourceDefinitionArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:apiextensions.k8s.io/v1:CustomResourceDefinition", name, SetAPIKindAndVersion(args), options)
+            : base("kubernetes:apiextensions.k8s.io/v1:CustomResourceDefinition", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
@@ -72,6 +72,19 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiExtensions.V1.C
             return args;
         }
 
+        private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
+        {
+            var extraOptions = new CustomResourceOptions
+            {
+                Aliases =
+                {
+                    new Alias { Type = "kubernetes:apiextensions.k8s.io/v1beta1:CustomResourceDefinition" },
+                }
+            };
+
+            return CustomResourceOptions.Merge(options, extraOptions);
+        }
+
         /// <summary>
         /// Get an existing CustomResourceDefinition resource's state with the given name and ID.
         /// </summary>
@@ -83,6 +96,5 @@ public static CustomResourceDefinition Get(string name, Input<string> id, Custom
             return new CustomResourceDefinition(name, default(Types.Inputs.ApiExtensions.V1.CustomResourceDefinitionArgs),
                 CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
         }
-
     }
 }

sdk/dotnet/ApiExtensions/V1/CustomResourceDefinitionList.cs

@@ -48,7 +48,7 @@ public partial class CustomResourceDefinitionList : KubernetesResource
         /// <param name="args">The arguments used to populate this resource's properties</param>
         /// <param name="options">A bag of options that control this resource's behavior</param>
         public CustomResourceDefinitionList(string name, Types.Inputs.ApiExtensions.V1.CustomResourceDefinitionListArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:apiextensions.k8s.io/v1:CustomResourceDefinitionList", name, SetAPIKindAndVersion(args), options)
+            : base("kubernetes:apiextensions.k8s.io/v1:CustomResourceDefinitionList", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
@@ -65,6 +65,11 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiExtensions.V1.C
             return args;
         }
 
+        private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
+        {
+            return options;
+        }
+
         /// <summary>
         /// Get an existing CustomResourceDefinitionList resource's state with the given name and ID.
         /// </summary>
@@ -76,6 +81,5 @@ public static CustomResourceDefinitionList Get(string name, Input<string> id, Cu
             return new CustomResourceDefinitionList(name, default(Types.Inputs.ApiExtensions.V1.CustomResourceDefinitionListArgs),
                 CustomResourceOptions.Merge(options, new CustomResourceOptions {Id = id}));
         }
-
     }
 }