Skip to content

Commit

Permalink
Merge pull request #123 from pulumi/stack72/pulumi-v2.9.0
Browse files Browse the repository at this point in the history
Upgrade to Pulumi v2.9.0
  • Loading branch information
stack72 authored Aug 26, 2020
2 parents 3ec57dd + efc4f0a commit 8927c09
Show file tree
Hide file tree
Showing 133 changed files with 12,769 additions and 4,166 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ CHANGELOG
=========

## HEAD (Unreleased)
_(none)_
* Upgrade to pulumi-terraform-bridge v2.7.0
* Upgrade to Pulumi v2.9.0, which adds type annotations and input/output classes to Python

---

Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
[![Build Status](https://travis-ci.com/pulumi/pulumi-digitalocean.svg?token=eHg7Zp5zdDDJfTjY8ejq&branch=master)](https://travis-ci.com/pulumi/pulumi-digitalocean)
[![Actions Status](https://github.com/pulumi/pulumi-digitalocean/workflows/master/badge.svg)](https://github.com/pulumi/pulumi-digitalocean/actions)
[![Slack](http://www.pulumi.com/images/docs/badges/slack.svg)](https://slack.pulumi.com)
[![NPM version](https://badge.fury.io/js/%40pulumi%2Fdigitalocean.svg)](https://www.npmjs.com/package/@pulumi/digitalocean)
[![Python version](https://badge.fury.io/py/pulumi-digitalocean.svg)](https://pypi.org/project/pulumi-digitalocean)
[![NuGet version](https://badge.fury.io/nu/pulumi.digitalocean.svg)](https://badge.fury.io/nu/pulumi.digitalocean)
[![PkgGoDev](https://pkg.go.dev/badge/github.com/pulumi/pulumi-digitalocean/sdk/v2/go)](https://pkg.go.dev/github.com/pulumi/pulumi-digitalocean/sdk/v2/go)
[![License](https://img.shields.io/npm/l/%40pulumi%2Fpulumi.svg)](https://github.com/pulumi/pulumi-digitalocean/blob/master/LICENSE)

# DigitalOcean provider

Expand Down
202 changes: 143 additions & 59 deletions provider/cmd/pulumi-resource-digitalocean/schema.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.14

require (
github.com/hashicorp/terraform-plugin-sdk v1.7.0
github.com/pulumi/pulumi-terraform-bridge/v2 v2.5.2
github.com/pulumi/pulumi/sdk/v2 v2.5.1-0.20200630091945-bb358c4d2173
github.com/pulumi/pulumi-terraform-bridge/v2 v2.7.2
github.com/pulumi/pulumi/sdk/v2 v2.9.1-0.20200821035132-629254334213
github.com/terraform-providers/terraform-provider-digitalocean v1.19.0
)

Expand Down
124 changes: 124 additions & 0 deletions provider/go.sum

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,9 @@ func Provider() tfbridge.ProviderInfo {
},
Python: &tfbridge.PythonInfo{
Requires: map[string]string{
"pulumi": ">=2.0.0,<3.0.0",
"pulumi": ">=2.9.0,<3.0.0",
},
UsesIOClasses: true,
},
CSharp: &tfbridge.CSharpInfo{
PackageReferences: map[string]string{
Expand Down
1 change: 0 additions & 1 deletion sdk/dotnet/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions sdk/dotnet/DatabaseFirewall.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@ public partial class DatabaseFirewall : Pulumi.CustomResource

/// <summary>
/// A rule specifying a resource allowed to access the database cluster. The following arguments must be specified:
/// - `type` - (Required) The type of resource that the firewall rule allows to access the database cluster. The possible values are: `droplet`, `k8s`, `ip_addr`, or `tag`.
/// - `value` - (Required) The ID of the specific resource, the name of a tag applied to a group of resources, or the IP address that the firewall rule allows to access the database cluster.
/// </summary>
[Output("rules")]
public Output<ImmutableArray<Outputs.DatabaseFirewallRule>> Rules { get; private set; } = null!;
Expand Down Expand Up @@ -168,8 +166,6 @@ public sealed class DatabaseFirewallArgs : Pulumi.ResourceArgs

/// <summary>
/// A rule specifying a resource allowed to access the database cluster. The following arguments must be specified:
/// - `type` - (Required) The type of resource that the firewall rule allows to access the database cluster. The possible values are: `droplet`, `k8s`, `ip_addr`, or `tag`.
/// - `value` - (Required) The ID of the specific resource, the name of a tag applied to a group of resources, or the IP address that the firewall rule allows to access the database cluster.
/// </summary>
public InputList<Inputs.DatabaseFirewallRuleArgs> Rules
{
Expand All @@ -195,8 +191,6 @@ public sealed class DatabaseFirewallState : Pulumi.ResourceArgs

/// <summary>
/// A rule specifying a resource allowed to access the database cluster. The following arguments must be specified:
/// - `type` - (Required) The type of resource that the firewall rule allows to access the database cluster. The possible values are: `droplet`, `k8s`, `ip_addr`, or `tag`.
/// - `value` - (Required) The ID of the specific resource, the name of a tag applied to a group of resources, or the IP address that the firewall rule allows to access the database cluster.
/// </summary>
public InputList<Inputs.DatabaseFirewallRuleGetArgs> Rules
{
Expand Down
4 changes: 0 additions & 4 deletions sdk/dotnet/GetImage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,6 @@ public sealed class GetImageArgs : Pulumi.InvokeArgs

/// <summary>
/// Restrict the search to one of the following categories of images:
/// - `all` - All images (whether public or private)
/// - `applications` - One-click applications
/// - `distributions` - Distributions
/// - `user` - (Default) User (private) images
/// </summary>
[Input("source")]
public string? Source { get; set; }
Expand Down
12 changes: 0 additions & 12 deletions sdk/dotnet/GetImages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -157,18 +157,6 @@ public sealed class GetImagesResult
/// - `id`: The ID of the image.
/// - `name`: The name of the image.
/// - `type`: Type of the image.
/// - `distribution` - The name of the distribution of the OS of the image.
/// - `min_disk_size`: The minimum 'disk' required for the image.
/// - `size_gigabytes`: The size of the image in GB.
/// - `private` - Is image a public image or not. Public images represent
/// Linux distributions or One-Click Applications, while non-public images represent
/// snapshots and backups and are only available within your account.
/// - `regions`: A set of the regions that the image is available in.
/// - `tags`: A set of tags applied to the image
/// - `created`: When the image was created
/// - `status`: Current status of the image
/// - `error_message`: Any applicable error message pertaining to the image
/// - `image` - The id of the image (legacy parameter).
/// </summary>
public readonly ImmutableArray<Outputs.GetImagesImageResult> Images;
public readonly ImmutableArray<Outputs.GetImagesSortResult> Sorts;
Expand Down
37 changes: 8 additions & 29 deletions sdk/dotnet/GetKubernetesCluster.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public sealed class GetKubernetesClusterArgs : Pulumi.InvokeArgs
private List<string>? _tags;

/// <summary>
/// A list of tag names to be applied to the Kubernetes cluster.
/// A list of tag names applied to the node pool.
/// </summary>
public List<string> Tags
{
Expand All @@ -53,7 +53,7 @@ public sealed class GetKubernetesClusterResult
/// </summary>
public readonly string ClusterSubnet;
/// <summary>
/// The date and time when the Kubernetes cluster was created.
/// The date and time when the node was created.
/// </summary>
public readonly string CreatedAt;
/// <summary>
Expand All @@ -69,25 +69,12 @@ public sealed class GetKubernetesClusterResult
/// </summary>
public readonly string Ipv4Address;
public readonly ImmutableArray<Outputs.GetKubernetesClusterKubeConfigResult> KubeConfigs;
/// <summary>
/// The auto-generated name for the node.
/// </summary>
public readonly string Name;
/// <summary>
/// A list of node pools associated with the cluster. Each node pool exports the following attributes:
/// - `id` - The unique ID that can be used to identify and reference the node pool.
/// - `name` - The name of the node pool.
/// - `size` - The slug identifier for the type of Droplet used as workers in the node pool.
/// - `node_count` - The number of Droplet instances in the node pool.
/// - `actual_node_count` - The actual number of nodes in the node pool, which is especially useful when auto-scaling is enabled.
/// - `auto_scale` - A boolean indicating whether auto-scaling is enabled on the node pool.
/// - `min_nodes` - If auto-scaling is enabled, this represents the minimum number of nodes that the node pool can be scaled down to.
/// - `max_nodes` - If auto-scaling is enabled, this represents the maximum number of nodes that the node pool can be scaled up to.
/// - `tags` - A list of tag names applied to the node pool.
/// - `labels` - A map of key/value pairs applied to nodes in the pool. The labels are exposed in the Kubernetes API as labels in the metadata of the corresponding [Node resources](https://kubernetes.io/docs/concepts/architecture/nodes/).
/// - `nodes` - A list of nodes in the pool. Each node exports the following attributes:
/// + `id` - A unique ID that can be used to identify and reference the node.
/// + `name` - The auto-generated name for the node.
/// + `status` - A string indicating the current status of the individual node.
/// + `created_at` - The date and time when the node was created.
/// + `updated_at` - The date and time when the node was last updated.
/// </summary>
public readonly ImmutableArray<Outputs.GetKubernetesClusterNodePoolResult> NodePools;
/// <summary>
Expand All @@ -99,23 +86,15 @@ public sealed class GetKubernetesClusterResult
/// </summary>
public readonly string ServiceSubnet;
/// <summary>
/// A string indicating the current status of the cluster. Potential values include running, provisioning, and errored.
/// A string indicating the current status of the individual node.
/// </summary>
public readonly string Status;
/// <summary>
/// A list of tag names to be applied to the Kubernetes cluster.
/// A list of tag names applied to the node pool.
/// </summary>
public readonly ImmutableArray<string> Tags;
/// <summary>
/// The date and time when the Kubernetes cluster was last updated.
/// * `kube_config.0` - A representation of the Kubernetes cluster's kubeconfig with the following attributes:
/// - `raw_config` - The full contents of the Kubernetes cluster's kubeconfig file.
/// - `host` - The URL of the API server on the Kubernetes master node.
/// - `cluster_ca_certificate` - The base64 encoded public certificate for the cluster's certificate authority.
/// - `token` - The DigitalOcean API access token used by clients to access the cluster.
/// - `client_key` - The base64 encoded private key used by clients to access the cluster. Only available if token authentication is not supported on your cluster.
/// - `client_certificate` - The base64 encoded public certificate used by clients to access the cluster. Only available if token authentication is not supported on your cluster.
/// - `expires_at` - The date and time when the credentials will expire and need to be regenerated.
/// The date and time when the node was last updated.
/// </summary>
public readonly string UpdatedAt;
/// <summary>
Expand Down
10 changes: 0 additions & 10 deletions sdk/dotnet/GetProjects.cs
Original file line number Diff line number Diff line change
Expand Up @@ -152,16 +152,6 @@ public sealed class GetProjectsResult
/// <summary>
/// A set of projects satisfying any `filter` and `sort` criteria. Each project has
/// the following attributes:
/// - `id` - The ID of the project
/// - `name` - The name of the project
/// - `description` - The description of the project
/// - `purpose` - The purpose of the project (Default: "Web Application")
/// - `environment` - The environment of the project's resources. The possible values are: `Development`, `Staging`, `Production`.
/// - `resources` - A set of uniform resource names (URNs) for the resources associated with the project
/// - `owner_uuid` - The unique universal identifier of the project owner
/// - `owner_id` - The ID of the project owner
/// - `created_at` - The date and time when the project was created, (ISO8601)
/// - `updated_at` - The date and time when the project was last updated, (ISO8601)
/// </summary>
public readonly ImmutableArray<Outputs.GetProjectsProjectResult> Projects;
public readonly ImmutableArray<Outputs.GetProjectsSortResult> Sorts;
Expand Down
7 changes: 1 addition & 6 deletions sdk/dotnet/GetRegions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,7 @@ public sealed class GetRegionsResult
/// </summary>
public readonly string Id;
/// <summary>
/// A set of regions satisfying any `filter` and `sort` criteria. Each region has the following attributes:
/// - `slug` - A human-readable string that is used as a unique identifier for each region.
/// - `name` - The display name of the region.
/// - `available` - A boolean value that represents whether new Droplets can be created in this region.
/// - `sizes` - A set of identifying slugs for the Droplet sizes available in this region.
/// - `features` - A set of features available in this region.
/// A set of regions satisfying any `filter` and `sort` criteria. Each region has the following attributes:
/// </summary>
public readonly ImmutableArray<Outputs.GetRegionsRegionResult> Regions;
public readonly ImmutableArray<Outputs.GetRegionsSortResult> Sorts;
Expand Down
6 changes: 6 additions & 0 deletions sdk/dotnet/Inputs/DatabaseFirewallRuleArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ public sealed class DatabaseFirewallRuleArgs : Pulumi.ResourceArgs
[Input("createdAt")]
public Input<string>? CreatedAt { get; set; }

/// <summary>
/// The type of resource that the firewall rule allows to access the database cluster. The possible values are: `droplet`, `k8s`, `ip_addr`, or `tag`.
/// </summary>
[Input("type", required: true)]
public Input<string> Type { get; set; } = null!;

Expand All @@ -27,6 +30,9 @@ public sealed class DatabaseFirewallRuleArgs : Pulumi.ResourceArgs
[Input("uuid")]
public Input<string>? Uuid { get; set; }

/// <summary>
/// The ID of the specific resource, the name of a tag applied to a group of resources, or the IP address that the firewall rule allows to access the database cluster.
/// </summary>
[Input("value", required: true)]
public Input<string> Value { get; set; } = null!;

Expand Down
6 changes: 6 additions & 0 deletions sdk/dotnet/Inputs/DatabaseFirewallRuleGetArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ public sealed class DatabaseFirewallRuleGetArgs : Pulumi.ResourceArgs
[Input("createdAt")]
public Input<string>? CreatedAt { get; set; }

/// <summary>
/// The type of resource that the firewall rule allows to access the database cluster. The possible values are: `droplet`, `k8s`, `ip_addr`, or `tag`.
/// </summary>
[Input("type", required: true)]
public Input<string> Type { get; set; } = null!;

Expand All @@ -27,6 +30,9 @@ public sealed class DatabaseFirewallRuleGetArgs : Pulumi.ResourceArgs
[Input("uuid")]
public Input<string>? Uuid { get; set; }

/// <summary>
/// The ID of the specific resource, the name of a tag applied to a group of resources, or the IP address that the firewall rule allows to access the database cluster.
/// </summary>
[Input("value", required: true)]
public Input<string> Value { get; set; } = null!;

Expand Down
21 changes: 21 additions & 0 deletions sdk/dotnet/Inputs/KubernetesClusterKubeConfigArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,45 @@ namespace Pulumi.DigitalOcean.Inputs

public sealed class KubernetesClusterKubeConfigArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The base64 encoded public certificate used by clients to access the cluster. Only available if token authentication is not supported on your cluster.
/// </summary>
[Input("clientCertificate")]
public Input<string>? ClientCertificate { get; set; }

/// <summary>
/// The base64 encoded private key used by clients to access the cluster. Only available if token authentication is not supported on your cluster.
/// </summary>
[Input("clientKey")]
public Input<string>? ClientKey { get; set; }

/// <summary>
/// The base64 encoded public certificate for the cluster's certificate authority.
/// </summary>
[Input("clusterCaCertificate")]
public Input<string>? ClusterCaCertificate { get; set; }

/// <summary>
/// The date and time when the credentials will expire and need to be regenerated.
/// </summary>
[Input("expiresAt")]
public Input<string>? ExpiresAt { get; set; }

/// <summary>
/// The URL of the API server on the Kubernetes master node.
/// </summary>
[Input("host")]
public Input<string>? Host { get; set; }

/// <summary>
/// The full contents of the Kubernetes cluster's kubeconfig file.
/// </summary>
[Input("rawConfig")]
public Input<string>? RawConfig { get; set; }

/// <summary>
/// The DigitalOcean API access token used by clients to access the cluster.
/// </summary>
[Input("token")]
public Input<string>? Token { get; set; }

Expand Down
21 changes: 21 additions & 0 deletions sdk/dotnet/Inputs/KubernetesClusterKubeConfigGetArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,45 @@ namespace Pulumi.DigitalOcean.Inputs

public sealed class KubernetesClusterKubeConfigGetArgs : Pulumi.ResourceArgs
{
/// <summary>
/// The base64 encoded public certificate used by clients to access the cluster. Only available if token authentication is not supported on your cluster.
/// </summary>
[Input("clientCertificate")]
public Input<string>? ClientCertificate { get; set; }

/// <summary>
/// The base64 encoded private key used by clients to access the cluster. Only available if token authentication is not supported on your cluster.
/// </summary>
[Input("clientKey")]
public Input<string>? ClientKey { get; set; }

/// <summary>
/// The base64 encoded public certificate for the cluster's certificate authority.
/// </summary>
[Input("clusterCaCertificate")]
public Input<string>? ClusterCaCertificate { get; set; }

/// <summary>
/// The date and time when the credentials will expire and need to be regenerated.
/// </summary>
[Input("expiresAt")]
public Input<string>? ExpiresAt { get; set; }

/// <summary>
/// The URL of the API server on the Kubernetes master node.
/// </summary>
[Input("host")]
public Input<string>? Host { get; set; }

/// <summary>
/// The full contents of the Kubernetes cluster's kubeconfig file.
/// </summary>
[Input("rawConfig")]
public Input<string>? RawConfig { get; set; }

/// <summary>
/// The DigitalOcean API access token used by clients to access the cluster.
/// </summary>
[Input("token")]
public Input<string>? Token { get; set; }

Expand Down
Loading

0 comments on commit 8927c09

Please sign in to comment.