Skip to content

Commit

Permalink
Merge pull request #184 from pulumi/iwahbe/179/upgrade-tf-provider-ra…
Browse files Browse the repository at this point in the history 
…ncher2-to-v1.25.0

Upgrade terraform-provider-rancher2 to v1.25.0
  • Loading branch information
@iwahbe
iwahbe authored Jan 18, 2023
2 parents c1141ee + 86e4db3 commit 0488879
Show file tree
Hide file tree
Showing 1,510 changed files with 122,152 additions and 74,861 deletions.
23,177 changes: 13,313 additions & 9,864 deletions provider/cmd/pulumi-resource-rancher2/schema.json
View file

Large diffs are not rendered by default.

323 changes: 175 additions & 148 deletions provider/go.mod
View file

Large diffs are not rendered by default.

1,691 changes: 934 additions & 757 deletions provider/go.sum
View file

Large diffs are not rendered by default.

127 changes: 108 additions & 19 deletions sdk/dotnet/ActiveDirectory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Pulumi.Rancher2
/// </summary>
[Obsolete(@"rancher2.ActiveDirectory has been deprecated in favor of rancher2.AuthConfigActiveDirectory")]
[Rancher2ResourceType("rancher2:index/activeDirectory:ActiveDirectory")]
public partial class ActiveDirectory : Pulumi.CustomResource
public partial class ActiveDirectory : global::Pulumi.CustomResource
{
/// <summary>
/// Access mode for auth. `required`, `restricted`, `unrestricted` are supported. Default `unrestricted` (string)
Expand Down Expand Up @@ -251,6 +251,13 @@ private static CustomResourceOptions MakeResourceOptions(CustomResourceOptions?
var defaultOptions = new CustomResourceOptions
{
Version = Utilities.Version,
AdditionalSecretOutputs =
{
"certificate",
"serviceAccountPassword",
"serviceAccountUsername",
"testPassword",
},
};
var merged = CustomResourceOptions.Merge(defaultOptions, options);
// Override the ID if one was specified for consistency with other language SDKs.
Expand All @@ -272,7 +279,7 @@ public static ActiveDirectory Get(string name, Input<string> id, ActiveDirectory
}
}

public sealed class ActiveDirectoryArgs : Pulumi.ResourceArgs
public sealed class ActiveDirectoryArgs : global::Pulumi.ResourceArgs
{
/// <summary>
/// Access mode for auth. `required`, `restricted`, `unrestricted` are supported. Default `unrestricted` (string)
Expand Down Expand Up @@ -304,11 +311,21 @@ public InputMap<object> Annotations
set => _annotations = value;
}

[Input("certificate")]
private Input<string>? _certificate;

/// <summary>
/// CA certificate for TLS if selfsigned (string)
/// </summary>
[Input("certificate")]
public Input<string>? Certificate { get; set; }
public Input<string>? Certificate
{
get => _certificate;
set
{
var emptySecret = Output.CreateSecret(0);
_certificate = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
}
}

/// <summary>
/// ActiveDirectory connection timeout. Default `5000` (int)
Expand Down Expand Up @@ -412,29 +429,59 @@ public InputList<string> Servers
set => _servers = value;
}

[Input("serviceAccountPassword", required: true)]
private Input<string>? _serviceAccountPassword;

/// <summary>
/// Service account password for access ActiveDirectory service (string)
/// </summary>
[Input("serviceAccountPassword", required: true)]
public Input<string> ServiceAccountPassword { get; set; } = null!;
public Input<string>? ServiceAccountPassword
{
get => _serviceAccountPassword;
set
{
var emptySecret = Output.CreateSecret(0);
_serviceAccountPassword = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
}
}

[Input("serviceAccountUsername", required: true)]
private Input<string>? _serviceAccountUsername;

/// <summary>
/// Service account DN for access ActiveDirectory service (string)
/// </summary>
[Input("serviceAccountUsername", required: true)]
public Input<string> ServiceAccountUsername { get; set; } = null!;
public Input<string>? ServiceAccountUsername
{
get => _serviceAccountUsername;
set
{
var emptySecret = Output.CreateSecret(0);
_serviceAccountUsername = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
}
}

/// <summary>
/// Enable start TLS connection (bool)
/// </summary>
[Input("startTls")]
public Input<bool>? StartTls { get; set; }

[Input("testPassword", required: true)]
private Input<string>? _testPassword;

/// <summary>
/// Password for test access to ActiveDirectory service (string)
/// </summary>
[Input("testPassword", required: true)]
public Input<string> TestPassword { get; set; } = null!;
public Input<string>? TestPassword
{
get => _testPassword;
set
{
var emptySecret = Output.CreateSecret(0);
_testPassword = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
}
}

/// <summary>
/// Username for test access to ActiveDirectory service (string)
Expand Down Expand Up @@ -499,9 +546,10 @@ public InputList<string> Servers
public ActiveDirectoryArgs()
{
}
public static new ActiveDirectoryArgs Empty => new ActiveDirectoryArgs();
}

public sealed class ActiveDirectoryState : Pulumi.ResourceArgs
public sealed class ActiveDirectoryState : global::Pulumi.ResourceArgs
{
/// <summary>
/// Access mode for auth. `required`, `restricted`, `unrestricted` are supported. Default `unrestricted` (string)
Expand Down Expand Up @@ -533,11 +581,21 @@ public InputMap<object> Annotations
set => _annotations = value;
}

[Input("certificate")]
private Input<string>? _certificate;

/// <summary>
/// CA certificate for TLS if selfsigned (string)
/// </summary>
[Input("certificate")]
public Input<string>? Certificate { get; set; }
public Input<string>? Certificate
{
get => _certificate;
set
{
var emptySecret = Output.CreateSecret(0);
_certificate = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
}
}

/// <summary>
/// ActiveDirectory connection timeout. Default `5000` (int)
Expand Down Expand Up @@ -647,29 +705,59 @@ public InputList<string> Servers
set => _servers = value;
}

[Input("serviceAccountPassword")]
private Input<string>? _serviceAccountPassword;

/// <summary>
/// Service account password for access ActiveDirectory service (string)
/// </summary>
[Input("serviceAccountPassword")]
public Input<string>? ServiceAccountPassword { get; set; }
public Input<string>? ServiceAccountPassword
{
get => _serviceAccountPassword;
set
{
var emptySecret = Output.CreateSecret(0);
_serviceAccountPassword = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
}
}

[Input("serviceAccountUsername")]
private Input<string>? _serviceAccountUsername;

/// <summary>
/// Service account DN for access ActiveDirectory service (string)
/// </summary>
[Input("serviceAccountUsername")]
public Input<string>? ServiceAccountUsername { get; set; }
public Input<string>? ServiceAccountUsername
{
get => _serviceAccountUsername;
set
{
var emptySecret = Output.CreateSecret(0);
_serviceAccountUsername = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
}
}

/// <summary>
/// Enable start TLS connection (bool)
/// </summary>
[Input("startTls")]
public Input<bool>? StartTls { get; set; }

[Input("testPassword")]
private Input<string>? _testPassword;

/// <summary>
/// Password for test access to ActiveDirectory service (string)
/// </summary>
[Input("testPassword")]
public Input<string>? TestPassword { get; set; }
public Input<string>? TestPassword
{
get => _testPassword;
set
{
var emptySecret = Output.CreateSecret(0);
_testPassword = Output.Tuple<Input<string>?, int>(value, emptySecret).Apply(t => t.Item1);
}
}

/// <summary>
/// Username for test access to ActiveDirectory service (string)
Expand Down Expand Up @@ -740,5 +828,6 @@ public InputList<string> Servers
public ActiveDirectoryState()
{
}
public static new ActiveDirectoryState Empty => new ActiveDirectoryState();
}
}
103 changes: 51 additions & 52 deletions sdk/dotnet/App.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,75 +13,72 @@ namespace Pulumi.Rancher2
/// ## Example Usage
///
/// ```csharp
/// using System.Collections.Generic;
/// using Pulumi;
/// using Rancher2 = Pulumi.Rancher2;
///
/// class MyStack : Stack
/// return await Deployment.RunAsync(() =&gt;
/// {
/// public MyStack()
/// // Create a new rancher2 App
/// var foo = new Rancher2.App("foo", new()
/// {
/// // Create a new rancher2 App
/// var foo = new Rancher2.App("foo", new Rancher2.AppArgs
/// Answers =
/// {
/// Answers =
/// {
/// { "foo", "bar" },
/// { "ingress.annotations.nginx.ingress.kubernetes.io/force-ssl-redirect", true },
/// { "ingress_host", "test.xip.io" },
/// },
/// CatalogName = "&lt;catalog_name&gt;",
/// Description = "Foo app",
/// ProjectId = "&lt;project_id&gt;",
/// TargetNamespace = "&lt;namespace_name&gt;",
/// TemplateName = "&lt;template_name&gt;",
/// TemplateVersion = "&lt;template_version&gt;",
/// });
/// }
/// { "foo", "bar" },
/// { "ingress.annotations.nginx.ingress.kubernetes.io/force-ssl-redirect", true },
/// { "ingress_host", "test.xip.io" },
/// },
/// CatalogName = "&lt;catalog_name&gt;",
/// Description = "Foo app",
/// ProjectId = "&lt;project_id&gt;",
/// TargetNamespace = "&lt;namespace_name&gt;",
/// TemplateName = "&lt;template_name&gt;",
/// TemplateVersion = "&lt;template_version&gt;",
/// });
///
/// }
/// });
/// ```
///
/// ```csharp
/// using System.Collections.Generic;
/// using Pulumi;
/// using Rancher2 = Pulumi.Rancher2;
///
/// class MyStack : Stack
/// return await Deployment.RunAsync(() =&gt;
/// {
/// public MyStack()
/// // Create a new rancher2 App in a new namespace
/// var fooNamespace = new Rancher2.Namespace("fooNamespace", new()
/// {
/// // Create a new rancher2 App in a new namespace
/// var fooNamespace = new Rancher2.Namespace("fooNamespace", new Rancher2.NamespaceArgs
/// Description = "Foo namespace",
/// ProjectId = "&lt;project_id&gt;",
/// ResourceQuota = new Rancher2.Inputs.NamespaceResourceQuotaArgs
/// {
/// Description = "Foo namespace",
/// ProjectId = "&lt;project_id&gt;",
/// ResourceQuota = new Rancher2.Inputs.NamespaceResourceQuotaArgs
/// Limit = new Rancher2.Inputs.NamespaceResourceQuotaLimitArgs
/// {
/// Limit = new Rancher2.Inputs.NamespaceResourceQuotaLimitArgs
/// {
/// LimitsCpu = "100m",
/// LimitsMemory = "100Mi",
/// RequestsStorage = "1Gi",
/// },
/// LimitsCpu = "100m",
/// LimitsMemory = "100Mi",
/// RequestsStorage = "1Gi",
/// },
/// });
/// var fooApp = new Rancher2.App("fooApp", new Rancher2.AppArgs
/// },
/// });
///
/// var fooApp = new Rancher2.App("fooApp", new()
/// {
/// CatalogName = "&lt;catalog_name&gt;",
/// Description = "Foo app",
/// ProjectId = "&lt;project_id&gt;",
/// TemplateName = "&lt;template_name&gt;",
/// TemplateVersion = "&lt;template_version&gt;",
/// TargetNamespace = fooNamespace.Id,
/// Answers =
/// {
/// CatalogName = "&lt;catalog_name&gt;",
/// Description = "Foo app",
/// ProjectId = "&lt;project_id&gt;",
/// TemplateName = "&lt;template_name&gt;",
/// TemplateVersion = "&lt;template_version&gt;",
/// TargetNamespace = fooNamespace.Id,
/// Answers =
/// {
/// { "ingress_host", "test.xip.io" },
/// { "foo", "bar" },
/// { "ingress.annotations.nginx.ingress.kubernetes.io/force-ssl-redirect", true },
/// },
/// });
/// }
/// { "ingress_host", "test.xip.io" },
/// { "foo", "bar" },
/// { "ingress.annotations.nginx.ingress.kubernetes.io/force-ssl-redirect", true },
/// },
/// });
///
/// }
/// });
/// ```
///
/// ## Import
Expand All @@ -93,7 +90,7 @@ namespace Pulumi.Rancher2
/// ```
/// </summary>
[Rancher2ResourceType("rancher2:index/app:App")]
public partial class App : Pulumi.CustomResource
public partial class App : global::Pulumi.CustomResource
{
/// <summary>
/// Annotations for App object (map)
Expand Down Expand Up @@ -231,7 +228,7 @@ public static App Get(string name, Input<string> id, AppState? state = null, Cus
}
}

public sealed class AppArgs : Pulumi.ResourceArgs
public sealed class AppArgs : global::Pulumi.ResourceArgs
{
[Input("annotations")]
private InputMap<object>? _annotations;
Expand Down Expand Up @@ -340,9 +337,10 @@ public InputMap<object> Labels
public AppArgs()
{
}
public static new AppArgs Empty => new AppArgs();
}

public sealed class AppState : Pulumi.ResourceArgs
public sealed class AppState : global::Pulumi.ResourceArgs
{
[Input("annotations")]
private InputMap<object>? _annotations;
Expand Down Expand Up @@ -457,5 +455,6 @@ public InputMap<object> Labels
public AppState()
{
}
public static new AppState Empty => new AppState();
}
}
Loading

0 comments on commit 0488879

Please sign in to comment.