Skip to content

Commit

Permalink
Merge pull request #117 from pulumi/stack72/v1.20.0
Browse files Browse the repository at this point in the history
  • Loading branch information
stack72 authored Jun 16, 2020
2 parents 4722edb + 070091e commit fc82e9e
Show file tree
Hide file tree
Showing 30 changed files with 1,574 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ CHANGELOG
=========

## HEAD (Unreleased)
_(none)_
* Upgrade to v1.20.0 of the DigitalOcean Terraform Provider

---

Expand Down
281 changes: 279 additions & 2 deletions provider/cmd/pulumi-resource-digitalocean/schema.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ replace (
github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
github.com/keybase/go-crypto => github.com/keybase/go-crypto v0.0.0-20190416182011-b785b22cc757
github.com/terraform-providers/terraform-provider-aws v2.32.0+incompatible => github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20191010190908-1261a98537f2
github.com/terraform-providers/terraform-provider-digitalocean => github.com/pulumi/terraform-provider-digitalocean v1.19.1-0.20200604100646-572682296547
github.com/terraform-providers/terraform-provider-digitalocean => github.com/pulumi/terraform-provider-digitalocean v1.19.1-0.20200616132413-016bf6859393
github.com/terraform-providers/terraform-provider-google v2.17.0+incompatible => github.com/terraform-providers/terraform-provider-google v1.20.1-0.20191008212436-363f2d283518
github.com/terraform-providers/terraform-provider-random v2.2.1+incompatible => github.com/terraform-providers/terraform-provider-random v1.3.2-0.20190925210718-83518d96ae4f
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59
Expand Down
5 changes: 2 additions & 3 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,6 @@ github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/pulumi/pulumi-digitalocean v2.5.1+incompatible h1:bhqi/fBbCmXrfZ6yYIMhcplwCnFhb5pwRQmj8WM21pY=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.0.0/go.mod h1:CShKXRvffj8fOwzDfBM8qxEpqfMpLLbEAb6QCtcGeUw=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.4.1-0.20200608011815-6feeb51f2d39 h1:8Y0+ZfJpafOyPsxXf+TFLjCEMudDlsl/uv3o1Pg7qWM=
github.com/pulumi/pulumi-terraform-bridge/v2 v2.4.1-0.20200608011815-6feeb51f2d39/go.mod h1:GI/1DagEgBD0PJUCt5wmaPLI8cx66IMzLRpy0oeucoo=
Expand All @@ -789,8 +788,8 @@ github.com/pulumi/pulumi/sdk/v2 v2.0.0/go.mod h1:W7k1UDYerc5o97mHnlHHp5iQZKEby+o
github.com/pulumi/pulumi/sdk/v2 v2.2.2-0.20200519081838-f66100ce28b0/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
github.com/pulumi/pulumi/sdk/v2 v2.3.1-0.20200607162109-9754465b04db h1:Q1/Azshl983zTcWXMqkbEcFt1UN88unn9tdMv5ouQ80=
github.com/pulumi/pulumi/sdk/v2 v2.3.1-0.20200607162109-9754465b04db/go.mod h1:llk6tmXss8kJrt3vEXAkwiwgZOuINEFmKIfMveVIwO8=
github.com/pulumi/terraform-provider-digitalocean v1.19.1-0.20200604100646-572682296547 h1:mvIHG/QqwfXEzdkHrVFVLRW27GOrY7QwNbbxoTyFpfc=
github.com/pulumi/terraform-provider-digitalocean v1.19.1-0.20200604100646-572682296547/go.mod h1:fmkoHCZCH38dQOOHhKGDgYZBvq1NfFWKV98XAmakYIM=
github.com/pulumi/terraform-provider-digitalocean v1.19.1-0.20200616132413-016bf6859393 h1:dOaePp2GQPxMhe+1nokbs5VDgrYPP5S2jACrD6ecXYM=
github.com/pulumi/terraform-provider-digitalocean v1.19.1-0.20200616132413-016bf6859393/go.mod h1:fmkoHCZCH38dQOOHhKGDgYZBvq1NfFWKV98XAmakYIM=
github.com/pulumi/tf2pulumi v0.8.1-0.20200519092335-cb56a4dfa88d h1:1JtzB9Gx0YX2UgKKkqJwTgBXxfg2cbLUEqTJKwKBK7s=
github.com/pulumi/tf2pulumi v0.8.1-0.20200519092335-cb56a4dfa88d/go.mod h1:yv9XozKsue9ZELHQbrBGgIaFtE3OX3Q4m7koTzTqgpE=
github.com/pulumi/tf2pulumi v0.8.1-0.20200528170746-c1234defe2b5 h1:h+pUwgEser1Ole6TMCc66njRPcw7SEVXpeoClG+ihEM=
Expand Down
1 change: 1 addition & 0 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ func Provider() tfbridge.ProviderInfo {
"digitalocean_spaces_bucket_objects": {Tok: makeDataSource(digitalOceanMod, "getSpacesBucketObjects")},
"digitalocean_droplets": {Tok: makeDataSource(digitalOceanMod, "getDroplets")},
"digitalocean_container_registry": {Tok: makeDataSource(digitalOceanMod, "getContainerRegistry")},
"digitalocean_tags": {Tok: makeDataSource(digitalOceanMod, "getTags")},
},
JavaScript: &tfbridge.JavaScriptInfo{
Dependencies: map[string]string{
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotnet/GetSizes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static class GetSizes
/// ## Example Usage
/// {{% example %}}
///
/// Most common usage will probably be to supply a size to droplet:
/// Most common usage will probably be to supply a size to Droplet:
///
/// ```csharp
/// using Pulumi;
Expand Down
44 changes: 43 additions & 1 deletion sdk/dotnet/GetTag.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,62 @@ public GetTagArgs()
[OutputType]
public sealed class GetTagResult
{
/// <summary>
/// A count of the database clusters that the tag is applied to.
/// </summary>
public readonly int DatabasesCount;
/// <summary>
/// A count of the Droplets the tag is applied to.
/// </summary>
public readonly int DropletsCount;
/// <summary>
/// The provider-assigned unique ID for this managed resource.
/// </summary>
public readonly string Id;
/// <summary>
/// A count of the images that the tag is applied to.
/// </summary>
public readonly int ImagesCount;
public readonly string Name;
/// <summary>
/// A count of the total number of resources that the tag is applied to.
/// </summary>
public readonly int TotalResourceCount;
/// <summary>
/// A count of the volume snapshots that the tag is applied to.
/// </summary>
public readonly int VolumeSnapshotsCount;
/// <summary>
/// A count of the volumes that the tag is applied to.
/// </summary>
public readonly int VolumesCount;

[OutputConstructor]
private GetTagResult(
int databasesCount,

int dropletsCount,

string id,

string name)
int imagesCount,

string name,

int totalResourceCount,

int volumeSnapshotsCount,

int volumesCount)
{
DatabasesCount = databasesCount;
DropletsCount = dropletsCount;
Id = id;
ImagesCount = imagesCount;
Name = name;
TotalResourceCount = totalResourceCount;
VolumeSnapshotsCount = volumeSnapshotsCount;
VolumesCount = volumesCount;
}
}
}
88 changes: 88 additions & 0 deletions sdk/dotnet/GetTags.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
// *** 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.DigitalOcean
{
public static class GetTags
{
/// <summary>
/// Returns a list of tags in your DigitalOcean account, with the ability to
/// filter and sort the results. If no filters are specified, all tags will be
/// returned.
///
/// {{% examples %}}
/// {{% /examples %}}
/// </summary>
public static Task<GetTagsResult> InvokeAsync(GetTagsArgs? args = null, InvokeOptions? options = null)
=> Pulumi.Deployment.Instance.InvokeAsync<GetTagsResult>("digitalocean:index/getTags:getTags", args ?? new GetTagsArgs(), options.WithVersion());
}


public sealed class GetTagsArgs : Pulumi.InvokeArgs
{
[Input("filters")]
private List<Inputs.GetTagsFilterArgs>? _filters;

/// <summary>
/// Filter the results.
/// The `filter` block is documented below.
/// </summary>
public List<Inputs.GetTagsFilterArgs> Filters
{
get => _filters ?? (_filters = new List<Inputs.GetTagsFilterArgs>());
set => _filters = value;
}

[Input("sorts")]
private List<Inputs.GetTagsSortArgs>? _sorts;

/// <summary>
/// Sort the results.
/// The `sort` block is documented below.
/// </summary>
public List<Inputs.GetTagsSortArgs> Sorts
{
get => _sorts ?? (_sorts = new List<Inputs.GetTagsSortArgs>());
set => _sorts = value;
}

public GetTagsArgs()
{
}
}


[OutputType]
public sealed class GetTagsResult
{
public readonly ImmutableArray<Outputs.GetTagsFilterResult> Filters;
/// <summary>
/// The provider-assigned unique ID for this managed resource.
/// </summary>
public readonly string Id;
public readonly ImmutableArray<Outputs.GetTagsSortResult> Sorts;
public readonly ImmutableArray<Outputs.GetTagsTagResult> Tags;

[OutputConstructor]
private GetTagsResult(
ImmutableArray<Outputs.GetTagsFilterResult> filters,

string id,

ImmutableArray<Outputs.GetTagsSortResult> sorts,

ImmutableArray<Outputs.GetTagsTagResult> tags)
{
Filters = filters;
Id = id;
Sorts = sorts;
Tags = tags;
}
}
}
38 changes: 38 additions & 0 deletions sdk/dotnet/Inputs/GetTagsFilterArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// *** 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.DigitalOcean.Inputs
{

public sealed class GetTagsFilterArgs : Pulumi.InvokeArgs
{
/// <summary>
/// Filter the tags by this key. This may be one of `name`, `total_resource_count`, `droplets_count`, `images_count`, `volumes_count`, `volume_snapshots_count`, or `databases_count`.
/// </summary>
[Input("key", required: true)]
public string Key { get; set; } = null!;

[Input("values", required: true)]
private List<string>? _values;

/// <summary>
/// Only retrieves tags which keys has value that matches
/// one of the values provided here.
/// </summary>
public List<string> Values
{
get => _values ?? (_values = new List<string>());
set => _values = value;
}

public GetTagsFilterArgs()
{
}
}
}
31 changes: 31 additions & 0 deletions sdk/dotnet/Inputs/GetTagsSortArgs.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// *** 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.DigitalOcean.Inputs
{

public sealed class GetTagsSortArgs : Pulumi.InvokeArgs
{
/// <summary>
/// The sort direction. This may be either `asc` or `desc`.
/// </summary>
[Input("direction")]
public string? Direction { get; set; }

/// <summary>
/// Sort the tags by this key. This may be one of `name`, `total_resource_count`, `droplets_count`, `images_count`, `volumes_count`, `volume_snapshots_count`, or `databases_count`.
/// </summary>
[Input("key", required: true)]
public string Key { get; set; } = null!;

public GetTagsSortArgs()
{
}
}
}
36 changes: 36 additions & 0 deletions sdk/dotnet/Outputs/GetTagsFilterResult.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// *** 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.DigitalOcean.Outputs
{

[OutputType]
public sealed class GetTagsFilterResult
{
/// <summary>
/// Filter the tags by this key. This may be one of `name`, `total_resource_count`, `droplets_count`, `images_count`, `volumes_count`, `volume_snapshots_count`, or `databases_count`.
/// </summary>
public readonly string Key;
/// <summary>
/// Only retrieves tags which keys has value that matches
/// one of the values provided here.
/// </summary>
public readonly ImmutableArray<string> Values;

[OutputConstructor]
private GetTagsFilterResult(
string key,

ImmutableArray<string> values)
{
Key = key;
Values = values;
}
}
}
35 changes: 35 additions & 0 deletions sdk/dotnet/Outputs/GetTagsSortResult.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// *** 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.DigitalOcean.Outputs
{

[OutputType]
public sealed class GetTagsSortResult
{
/// <summary>
/// The sort direction. This may be either `asc` or `desc`.
/// </summary>
public readonly string? Direction;
/// <summary>
/// Sort the tags by this key. This may be one of `name`, `total_resource_count`, `droplets_count`, `images_count`, `volumes_count`, `volume_snapshots_count`, or `databases_count`.
/// </summary>
public readonly string Key;

[OutputConstructor]
private GetTagsSortResult(
string? direction,

string key)
{
Direction = direction;
Key = key;
}
}
}
Loading

0 comments on commit fc82e9e

Please sign in to comment.