Skip to content

Commit

Permalink
Merge pull request #209 from pulumi/upgrade-terraform-provider-bigip-…
Browse files Browse the repository at this point in the history
…to-v1.17.0

Upgrade terraform-provider-bigip to v1.17.0
  • Loading branch information
iwahbe authored Mar 21, 2023
2 parents 754c1a3 + 4e20089 commit 9868c06
Show file tree
Hide file tree
Showing 52 changed files with 6,191 additions and 170 deletions.
470 changes: 464 additions & 6 deletions provider/cmd/pulumi-resource-f5bigip/schema.json

Large diffs are not rendered by default.

20 changes: 13 additions & 7 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ module github.com/pulumi/pulumi-f5bigip/provider/v3
go 1.19

require (
github.com/F5Networks/terraform-provider-bigip v1.16.2
github.com/hashicorp/terraform-plugin-sdk v1.17.2
github.com/pulumi/pulumi-terraform-bridge/v3 v3.42.0
github.com/F5Networks/terraform-provider-bigip v1.17.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.42.1
github.com/pulumi/pulumi/sdk/v3 v3.56.0
)

// Fixes build issues on windows: https://github.com/mattn/go-ieproxy/issues/45
replace github.com/mattn/go-ieproxy => github.com/mattn/go-ieproxy v0.0.1

replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20221122203342-430f685de305

require (
cloud.google.com/go v0.109.0 // indirect
cloud.google.com/go/compute v1.18.0 // indirect
Expand Down Expand Up @@ -85,8 +86,8 @@ require (
github.com/edsrzf/mmap-go v1.1.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/ettle/strcase v0.1.1 // indirect
github.com/f5devcentral/go-bigip v0.0.0-20230130103147-d518375c1a35 // indirect
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20230130103147-d518375c1a35 // indirect
github.com/f5devcentral/go-bigip v0.0.0-20230227165314-9b31aa3d380e // indirect
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20230227165314-9b31aa3d380e // indirect
github.com/fatih/color v1.14.1 // indirect
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813 // indirect
github.com/go-git/gcfg v1.5.0 // indirect
Expand All @@ -113,10 +114,10 @@ require (
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
github.com/hashicorp/go-getter v1.7.0 // indirect
github.com/hashicorp/go-hclog v1.2.2 // indirect
github.com/hashicorp/go-hclog v1.4.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-plugin v1.4.6 // indirect
github.com/hashicorp/go-plugin v1.4.8 // indirect
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
Expand All @@ -131,6 +132,10 @@ require (
github.com/hashicorp/hcl/v2 v2.16.1 // indirect
github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.14.3 // indirect
github.com/hashicorp/terraform-plugin-log v0.8.0 // indirect
github.com/hashicorp/terraform-plugin-sdk v1.17.2 // indirect
github.com/hashicorp/terraform-plugin-sdk/v2 v2.25.0 // indirect
github.com/hashicorp/terraform-svchost v0.1.0 // indirect
github.com/hashicorp/vault/api v1.8.2 // indirect
github.com/hashicorp/vault/sdk v0.6.1 // indirect
Expand Down Expand Up @@ -202,6 +207,7 @@ require (
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
github.com/vmihailenco/tagparser v0.1.2 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
Expand Down
96 changes: 43 additions & 53 deletions provider/go.sum

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ import (
"unicode"

"github.com/F5Networks/terraform-provider-bigip/bigip"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/pulumi/pulumi-f5bigip/provider/v3/pkg/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge/x"
shimv1 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v1"
shimv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2"
"github.com/pulumi/pulumi/sdk/v3/go/common/tokens"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
)
Expand Down Expand Up @@ -74,7 +73,7 @@ func makeDataSource(mod string, res string) tokens.ModuleMember {
// Provider returns additional overlaid schema and metadata associated with the F5 BigIP package.
func Provider() tfbridge.ProviderInfo {
prov := tfbridge.ProviderInfo{
P: shimv1.NewProvider(bigip.Provider().(*schema.Provider)),
P: shimv2.NewProvider(bigip.Provider()),
Name: "bigip",
Description: "A Pulumi package for creating and managing F5 BigIP resources.",
Keywords: []string{"pulumi", "f5", "bigip"},
Expand Down
33 changes: 33 additions & 0 deletions sdk/dotnet/FastHttpApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@ public partial class FastHttpApp : global::Pulumi.CustomResource
[Output("securityLogProfiles")]
public Output<ImmutableArray<string>> SecurityLogProfiles { get; private set; } = null!;

/// <summary>
/// `service_discovery` block to Automatically Discover Pool Members with Service Discovery.
/// See Service Discovery below for more details.
/// </summary>
[Output("serviceDiscoveries")]
public Output<ImmutableArray<Outputs.FastHttpAppServiceDiscovery>> ServiceDiscoveries { get; private set; } = null!;

/// <summary>
/// Slow ramp temporarily throttles the number of connections to a new pool member. The recommended value is 300 seconds
/// </summary>
Expand Down Expand Up @@ -266,6 +273,19 @@ public InputList<string> SecurityLogProfiles
set => _securityLogProfiles = value;
}

[Input("serviceDiscoveries")]
private InputList<Inputs.FastHttpAppServiceDiscoveryArgs>? _serviceDiscoveries;

/// <summary>
/// `service_discovery` block to Automatically Discover Pool Members with Service Discovery.
/// See Service Discovery below for more details.
/// </summary>
public InputList<Inputs.FastHttpAppServiceDiscoveryArgs> ServiceDiscoveries
{
get => _serviceDiscoveries ?? (_serviceDiscoveries = new InputList<Inputs.FastHttpAppServiceDiscoveryArgs>());
set => _serviceDiscoveries = value;
}

/// <summary>
/// Slow ramp temporarily throttles the number of connections to a new pool member. The recommended value is 300 seconds
/// </summary>
Expand Down Expand Up @@ -398,6 +418,19 @@ public InputList<string> SecurityLogProfiles
set => _securityLogProfiles = value;
}

[Input("serviceDiscoveries")]
private InputList<Inputs.FastHttpAppServiceDiscoveryGetArgs>? _serviceDiscoveries;

/// <summary>
/// `service_discovery` block to Automatically Discover Pool Members with Service Discovery.
/// See Service Discovery below for more details.
/// </summary>
public InputList<Inputs.FastHttpAppServiceDiscoveryGetArgs> ServiceDiscoveries
{
get => _serviceDiscoveries ?? (_serviceDiscoveries = new InputList<Inputs.FastHttpAppServiceDiscoveryGetArgs>());
set => _serviceDiscoveries = value;
}

/// <summary>
/// Slow ramp temporarily throttles the number of connections to a new pool member. The recommended value is 300 seconds
/// </summary>
Expand Down
33 changes: 33 additions & 0 deletions sdk/dotnet/FastHttpsApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@ public partial class FastHttpsApp : global::Pulumi.CustomResource
[Output("securityLogProfiles")]
public Output<ImmutableArray<string>> SecurityLogProfiles { get; private set; } = null!;

/// <summary>
/// `service_discovery` block to Automatically Discover Pool Members with Service Discovery.
/// See Service Discovery below for more details.
/// </summary>
[Output("serviceDiscoveries")]
public Output<ImmutableArray<Outputs.FastHttpsAppServiceDiscovery>> ServiceDiscoveries { get; private set; } = null!;

/// <summary>
/// Slow ramp temporarily throttles the number of connections to a new pool member. The recommended value is 300 seconds
/// </summary>
Expand Down Expand Up @@ -304,6 +311,19 @@ public InputList<string> SecurityLogProfiles
set => _securityLogProfiles = value;
}

[Input("serviceDiscoveries")]
private InputList<Inputs.FastHttpsAppServiceDiscoveryArgs>? _serviceDiscoveries;

/// <summary>
/// `service_discovery` block to Automatically Discover Pool Members with Service Discovery.
/// See Service Discovery below for more details.
/// </summary>
public InputList<Inputs.FastHttpsAppServiceDiscoveryArgs> ServiceDiscoveries
{
get => _serviceDiscoveries ?? (_serviceDiscoveries = new InputList<Inputs.FastHttpsAppServiceDiscoveryArgs>());
set => _serviceDiscoveries = value;
}

/// <summary>
/// Slow ramp temporarily throttles the number of connections to a new pool member. The recommended value is 300 seconds
/// </summary>
Expand Down Expand Up @@ -462,6 +482,19 @@ public InputList<string> SecurityLogProfiles
set => _securityLogProfiles = value;
}

[Input("serviceDiscoveries")]
private InputList<Inputs.FastHttpsAppServiceDiscoveryGetArgs>? _serviceDiscoveries;

/// <summary>
/// `service_discovery` block to Automatically Discover Pool Members with Service Discovery.
/// See Service Discovery below for more details.
/// </summary>
public InputList<Inputs.FastHttpsAppServiceDiscoveryGetArgs> ServiceDiscoveries
{
get => _serviceDiscoveries ?? (_serviceDiscoveries = new InputList<Inputs.FastHttpsAppServiceDiscoveryGetArgs>());
set => _serviceDiscoveries = value;
}

/// <summary>
/// Slow ramp temporarily throttles the number of connections to a new pool member. The recommended value is 300 seconds
/// </summary>
Expand Down
128 changes: 128 additions & 0 deletions sdk/dotnet/Inputs/FastHttpAppServiceDiscoveryArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
// *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
// *** Do not edit by hand unless you're certain you know what you are doing! ***

using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Threading.Tasks;
using Pulumi.Serialization;

namespace Pulumi.F5BigIP.Inputs
{

public sealed class FastHttpAppServiceDiscoveryArgs : global::Pulumi.ResourceArgs
{
/// <summary>
/// Specifies whether to look for public or private IP addresses. Default :`private`
/// </summary>
[Input("sdAddressRealm")]
public Input<string>? SdAddressRealm { get; set; }

/// <summary>
/// Information for discovering AWS nodes that are not in the same region as your BIG-IP.
/// </summary>
[Input("sdAwsAccessKey")]
public Input<string>? SdAwsAccessKey { get; set; }

/// <summary>
/// Empty string (default) means region in which ADC is running.
/// </summary>
[Input("sdAwsRegion")]
public Input<string>? SdAwsRegion { get; set; }

/// <summary>
/// Will be stored in the declaration as an encrypted string.
/// </summary>
[Input("sdAwsSecretAccessKey")]
public Input<string>? SdAwsSecretAccessKey { get; set; }

/// <summary>
/// The tag key associated with the node to add to this pool.
/// </summary>
[Input("sdAwsTagKey")]
public Input<string>? SdAwsTagKey { get; set; }

/// <summary>
/// The tag value associated with the node to add to this pool.
/// </summary>
[Input("sdAwsTagVal")]
public Input<string>? SdAwsTagVal { get; set; }

/// <summary>
/// Azure Active Directory ID (AKA tenant ID).
/// </summary>
[Input("sdAzureDirectoryId")]
public Input<string>? SdAzureDirectoryId { get; set; }

/// <summary>
/// Azure Resource Group name.
/// </summary>
[Input("sdAzureResourceGroup")]
public Input<string>? SdAzureResourceGroup { get; set; }

/// <summary>
/// ID of resource to find nodes by.
/// </summary>
[Input("sdAzureResourceId")]
public Input<string>? SdAzureResourceId { get; set; }

/// <summary>
/// Azure subscription ID.
/// </summary>
[Input("sdAzureSubscriptionId")]
public Input<string>? SdAzureSubscriptionId { get; set; }

/// <summary>
/// The tag key associated with the node to add to this pool.
/// </summary>
[Input("sdAzureTagKey")]
public Input<string>? SdAzureTagKey { get; set; }

/// <summary>
/// The tag value associated with the node to add to this pool.
/// </summary>
[Input("sdAzureTagVal")]
public Input<string>? SdAzureTagVal { get; set; }

/// <summary>
/// Empty string (default) means region in which ADC is running.
/// </summary>
[Input("sdGceRegion")]
public Input<string>? SdGceRegion { get; set; }

/// <summary>
/// The tag key associated with the node to add to this pool
/// </summary>
[Input("sdGceTagKey")]
public Input<string>? SdGceTagKey { get; set; }

/// <summary>
/// The tag value associated with the node to add to this pool.
/// </summary>
[Input("sdGceTagVal")]
public Input<string>? SdGceTagVal { get; set; }

/// <summary>
/// port number of serviceport to be used for FAST-Generated Pool.
/// </summary>
[Input("sdPort", required: true)]
public Input<int> SdPort { get; set; } = null!;

/// <summary>
/// service discovery account type, options [`aws`,`azure`,`gce`]
/// </summary>
[Input("sdType", required: true)]
public Input<string> SdType { get; set; } = null!;

/// <summary>
/// Action to take when node cannot be detected. Default `remove`.
/// </summary>
[Input("sdUndetectableAction")]
public Input<string>? SdUndetectableAction { get; set; }

public FastHttpAppServiceDiscoveryArgs()
{
}
public static new FastHttpAppServiceDiscoveryArgs Empty => new FastHttpAppServiceDiscoveryArgs();
}
}
Loading

0 comments on commit 9868c06

Please sign in to comment.