Fix merge conflict

pulumi · Mar 17, 2020 · 91e604c · 91e604c
1 parent b39d0d6
commit 91e604c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/sdk/dotnet/ApiRegistration/V1/APIService.cs b/sdk/dotnet/ApiRegistration/V1/APIService.cs
@@ -54,12 +54,12 @@ public partial class APIService : 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 APIService(string name, Types.Inputs.ApiRegistration.V1.APIServiceArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:apiregistration/v1:APIService", name, SetAPIKindAndVersion(args), MakeOptions(options))
+            : base("kubernetes:apiregistration.k8s.io/v1:APIService", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
         internal APIService(string name, ImmutableDictionary<string, object?> dictionary, CustomResourceOptions? options = null)
-            : base("kubernetes:apiregistration/v1:APIService", name, dictionary, options)
+            : base("kubernetes:apiregistration.k8s.io/v1:APIService", name, dictionary, options)
         {
         }
 
@@ -78,6 +78,8 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiRegistration.V1
                 Aliases =
                 {
                     new Alias { Type = "kubernetes:apiregistration.k8s.io/v1beta1:APIService" },
+                    new Alias { Type = "kubernetes:apiregistration/v1beta1:APIService" },
+                    new Alias { Type = "kubernetes:apiregistration/v1:APIService" },
                 }
             };
 

diff --git a/sdk/dotnet/ApiRegistration/V1/APIServiceList.cs b/sdk/dotnet/ApiRegistration/V1/APIServiceList.cs
@@ -46,12 +46,12 @@ public partial class APIServiceList : 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 APIServiceList(string name, Types.Inputs.ApiRegistration.V1.APIServiceListArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:apiregistration/v1:APIServiceList", name, SetAPIKindAndVersion(args), MakeOptions(options))
+            : base("kubernetes:apiregistration.k8s.io/v1:APIServiceList", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
         internal APIServiceList(string name, ImmutableDictionary<string, object?> dictionary, CustomResourceOptions? options = null)
-            : base("kubernetes:apiregistration/v1:APIServiceList", name, dictionary, options)
+            : base("kubernetes:apiregistration.k8s.io/v1:APIServiceList", name, dictionary, options)
         {
         }
 
@@ -65,7 +65,15 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiRegistration.V1
 
         private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
         {
-            return options;
+            var extraOptions = new CustomResourceOptions
+            {
+                Aliases =
+                {
+                    new Alias { Type = "kubernetes:apiregistration/v1:APIServiceList" },
+                }
+            };
+
+            return CustomResourceOptions.Merge(options, extraOptions);
         }
 
         /// <summary>

diff --git a/sdk/dotnet/ApiRegistration/V1Beta1/APIService.cs b/sdk/dotnet/ApiRegistration/V1Beta1/APIService.cs
@@ -54,12 +54,12 @@ public partial class APIService : 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 APIService(string name, Types.Inputs.ApiRegistration.V1Beta1.APIServiceArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:apiregistration/v1beta1:APIService", name, SetAPIKindAndVersion(args), MakeOptions(options))
+            : base("kubernetes:apiregistration.k8s.io/v1beta1:APIService", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
         internal APIService(string name, ImmutableDictionary<string, object?> dictionary, CustomResourceOptions? options = null)
-            : base("kubernetes:apiregistration/v1beta1:APIService", name, dictionary, options)
+            : base("kubernetes:apiregistration.k8s.io/v1beta1:APIService", name, dictionary, options)
         {
         }
 
@@ -78,6 +78,8 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiRegistration.V1
                 Aliases =
                 {
                     new Alias { Type = "kubernetes:apiregistration.k8s.io/v1:APIService" },
+                    new Alias { Type = "kubernetes:apiregistration/v1:APIService" },
+                    new Alias { Type = "kubernetes:apiregistration/v1beta1:APIService" },
                 }
             };
 

diff --git a/sdk/dotnet/ApiRegistration/V1Beta1/APIServiceList.cs b/sdk/dotnet/ApiRegistration/V1Beta1/APIServiceList.cs
@@ -46,12 +46,12 @@ public partial class APIServiceList : 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 APIServiceList(string name, Types.Inputs.ApiRegistration.V1Beta1.APIServiceListArgs? args = null, CustomResourceOptions? options = null)
-            : base("kubernetes:apiregistration/v1beta1:APIServiceList", name, SetAPIKindAndVersion(args), MakeOptions(options))
+            : base("kubernetes:apiregistration.k8s.io/v1beta1:APIServiceList", name, SetAPIKindAndVersion(args), MakeOptions(options))
         {
         }
 
         internal APIServiceList(string name, ImmutableDictionary<string, object?> dictionary, CustomResourceOptions? options = null)
-            : base("kubernetes:apiregistration/v1beta1:APIServiceList", name, dictionary, options)
+            : base("kubernetes:apiregistration.k8s.io/v1beta1:APIServiceList", name, dictionary, options)
         {
         }
 
@@ -65,7 +65,15 @@ private static ResourceArgs SetAPIKindAndVersion(Types.Inputs.ApiRegistration.V1
 
         private static CustomResourceOptions? MakeOptions(CustomResourceOptions? options)
         {
-            return options;
+            var extraOptions = new CustomResourceOptions
+            {
+                Aliases =
+                {
+                    new Alias { Type = "kubernetes:apiregistration/v1beta1:APIServiceList" },
+                }
+            };
+
+            return CustomResourceOptions.Merge(options, extraOptions);
         }
 
         /// <summary>