Skip to content

Commit

Permalink
Merge pull request #119 from pulumi/jen20/update-to-v2.3.0
Browse files Browse the repository at this point in the history
Update to upstream v2.3.0
  • Loading branch information
jen20 committed Apr 2, 2019
2 parents 7536140 + d7408c7 commit 3e07d81
Show file tree
Hide file tree
Showing 93 changed files with 1,106 additions and 327 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## 0.18.1 (Unreleased)

- Update to v2.3.0 of the Google Beta Terraform Provider.

## 0.18.0 (Released March 21, 2019)

### Important
Expand Down
6 changes: 3 additions & 3 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.template.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
name = "github.com/pulumi/pulumi-terraform"

[[constraint]]
version = "v2.2.0"
version = "v2.3.0"
name = "github.com/terraform-providers/terraform-provider-google-beta"

[constraint.metadata]
Expand Down
2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
name = "github.com/pulumi/pulumi-terraform"

[[constraint]]
version = "v2.2.0"
version = "v2.3.0"
name = "github.com/terraform-providers/terraform-provider-google-beta"

[constraint.metadata]
Expand Down
12 changes: 12 additions & 0 deletions resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,12 @@ func Provider() tfbridge.ProviderInfo {
Source: "google_folder.html.markdown",
},
},
"google_folder_organization_policy": {
Tok: gcpDataSource(gcpFolder, "getOrganizationPolicy"),
Docs: &tfbridge.DocInfo{
Source: "datasource_google_folder_organization_policy.html.markdown",
},
},
"google_iam_policy": {
Tok: gcpDataSource(gcpOrganization, "getIAMPolicy"),
Docs: &tfbridge.DocInfo{
Expand Down Expand Up @@ -923,6 +929,12 @@ func Provider() tfbridge.ProviderInfo {
Source: "google_projects.html.markdown",
},
},
"google_project_organization_policy": {
Tok: gcpDataSource(gcpProject, "getOrganizationPolicy"),
Docs: &tfbridge.DocInfo{
Source: "datasource_google_project_organization_policy.html.markdown",
},
},
"google_storage_bucket_object": {
Tok: gcpDataSource(gcpStorage, "getBucketObject"),
Docs: &tfbridge.DocInfo{
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/backendBucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
//
// To get more information about BackendBucket, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/backendBuckets)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/backendBuckets)
// * How-to Guides
// * [Using a Cloud Storage bucket as a load balancer backend](https://cloud.google.com/compute/docs/load-balancing/http/backend-bucket)
//
Expand Down
11 changes: 10 additions & 1 deletion sdk/go/gcp/compute/disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
//
// To get more information about Disk, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/disks)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/disks)
// * How-to Guides
// * [Adding a persistent disk](https://cloud.google.com/compute/docs/disks/add-persistent-disk)
//
Expand All @@ -53,6 +53,7 @@ func NewDisk(ctx *pulumi.Context,
inputs["image"] = nil
inputs["labels"] = nil
inputs["name"] = nil
inputs["physicalBlockSizeBytes"] = nil
inputs["project"] = nil
inputs["size"] = nil
inputs["snapshot"] = nil
Expand All @@ -66,6 +67,7 @@ func NewDisk(ctx *pulumi.Context,
inputs["image"] = args.Image
inputs["labels"] = args.Labels
inputs["name"] = args.Name
inputs["physicalBlockSizeBytes"] = args.PhysicalBlockSizeBytes
inputs["project"] = args.Project
inputs["size"] = args.Size
inputs["snapshot"] = args.Snapshot
Expand Down Expand Up @@ -104,6 +106,7 @@ func GetDisk(ctx *pulumi.Context,
inputs["lastAttachTimestamp"] = state.LastAttachTimestamp
inputs["lastDetachTimestamp"] = state.LastDetachTimestamp
inputs["name"] = state.Name
inputs["physicalBlockSizeBytes"] = state.PhysicalBlockSizeBytes
inputs["project"] = state.Project
inputs["selfLink"] = state.SelfLink
inputs["size"] = state.Size
Expand Down Expand Up @@ -169,6 +172,10 @@ func (r *Disk) Name() *pulumi.StringOutput {
return (*pulumi.StringOutput)(r.s.State["name"])
}

func (r *Disk) PhysicalBlockSizeBytes() *pulumi.IntOutput {
return (*pulumi.IntOutput)(r.s.State["physicalBlockSizeBytes"])
}

// The ID of the project in which the resource belongs.
// If it is not provided, the provider project is used.
func (r *Disk) Project() *pulumi.StringOutput {
Expand Down Expand Up @@ -227,6 +234,7 @@ type DiskState struct {
LastAttachTimestamp interface{}
LastDetachTimestamp interface{}
Name interface{}
PhysicalBlockSizeBytes interface{}
// The ID of the project in which the resource belongs.
// If it is not provided, the provider project is used.
Project interface{}
Expand All @@ -250,6 +258,7 @@ type DiskArgs struct {
Image interface{}
Labels interface{}
Name interface{}
PhysicalBlockSizeBytes interface{}
// The ID of the project in which the resource belongs.
// If it is not provided, the provider project is used.
Project interface{}
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/firewall.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
//
// To get more information about Firewall, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/firewalls)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/firewalls)
// * How-to Guides
// * [Official Documentation](https://cloud.google.com/vpc/docs/firewalls)
//
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/forwardingRule.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
//
// To get more information about ForwardingRule, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/forwardingRule)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/forwardingRule)
// * How-to Guides
// * [Official Documentation](https://cloud.google.com/compute/docs/load-balancing/network/forwarding-rules)
//
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/globalAddress.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
//
// To get more information about GlobalAddress, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/globalAddresses)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/globalAddresses)
// * How-to Guides
// * [Reserving a Static External IP Address](https://cloud.google.com/compute/docs/ip-addresses/reserve-static-external-ip-address)
//
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/healthCheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
//
// To get more information about HealthCheck, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/rest/latest/healthChecks)
// * [API documentation](https://cloud.google.com/compute/docs/reference/rest/v1/healthChecks)
// * How-to Guides
// * [Official Documentation](https://cloud.google.com/load-balancing/docs/health-checks)
//
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/httpHealthCheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
//
// To get more information about HttpHealthCheck, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/httpHealthChecks)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/httpHealthChecks)
// * How-to Guides
// * [Adding Health Checks](https://cloud.google.com/compute/docs/load-balancing/health-checks#legacy_health_checks)
//
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/httpsHealthCheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
//
// To get more information about HttpsHealthCheck, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/httpsHealthChecks)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/httpsHealthChecks)
// * How-to Guides
// * [Adding Health Checks](https://cloud.google.com/compute/docs/load-balancing/health-checks#legacy_health_checks)
//
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
//
// To get more information about Image, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/images)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/images)
// * How-to Guides
// * [Official Documentation](https://cloud.google.com/compute/docs/images)
//
Expand Down
9 changes: 9 additions & 0 deletions sdk/go/gcp/compute/regionDisk.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ func NewRegionDisk(ctx *pulumi.Context,
inputs["diskEncryptionKey"] = nil
inputs["labels"] = nil
inputs["name"] = nil
inputs["physicalBlockSizeBytes"] = nil
inputs["project"] = nil
inputs["region"] = nil
inputs["replicaZones"] = nil
Expand All @@ -68,6 +69,7 @@ func NewRegionDisk(ctx *pulumi.Context,
inputs["diskEncryptionKey"] = args.DiskEncryptionKey
inputs["labels"] = args.Labels
inputs["name"] = args.Name
inputs["physicalBlockSizeBytes"] = args.PhysicalBlockSizeBytes
inputs["project"] = args.Project
inputs["region"] = args.Region
inputs["replicaZones"] = args.ReplicaZones
Expand Down Expand Up @@ -104,6 +106,7 @@ func GetRegionDisk(ctx *pulumi.Context,
inputs["lastAttachTimestamp"] = state.LastAttachTimestamp
inputs["lastDetachTimestamp"] = state.LastDetachTimestamp
inputs["name"] = state.Name
inputs["physicalBlockSizeBytes"] = state.PhysicalBlockSizeBytes
inputs["project"] = state.Project
inputs["region"] = state.Region
inputs["replicaZones"] = state.ReplicaZones
Expand Down Expand Up @@ -164,6 +167,10 @@ func (r *RegionDisk) Name() *pulumi.StringOutput {
return (*pulumi.StringOutput)(r.s.State["name"])
}

func (r *RegionDisk) PhysicalBlockSizeBytes() *pulumi.IntOutput {
return (*pulumi.IntOutput)(r.s.State["physicalBlockSizeBytes"])
}

// The ID of the project in which the resource belongs.
// If it is not provided, the provider project is used.
func (r *RegionDisk) Project() *pulumi.StringOutput {
Expand Down Expand Up @@ -217,6 +224,7 @@ type RegionDiskState struct {
LastAttachTimestamp interface{}
LastDetachTimestamp interface{}
Name interface{}
PhysicalBlockSizeBytes interface{}
// The ID of the project in which the resource belongs.
// If it is not provided, the provider project is used.
Project interface{}
Expand All @@ -238,6 +246,7 @@ type RegionDiskArgs struct {
DiskEncryptionKey interface{}
Labels interface{}
Name interface{}
PhysicalBlockSizeBytes interface{}
// The ID of the project in which the resource belongs.
// If it is not provided, the provider project is used.
Project interface{}
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/targetHttpProxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
//
// To get more information about TargetHttpProxy, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/targetHttpProxies)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/targetHttpProxies)
// * How-to Guides
// * [Official Documentation](https://cloud.google.com/compute/docs/load-balancing/http/target-proxies)
//
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/targetHttpsProxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
//
// To get more information about TargetHttpsProxy, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/targetHttpsProxies)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/targetHttpsProxies)
// * How-to Guides
// * [Official Documentation](https://cloud.google.com/compute/docs/load-balancing/http/target-proxies)
//
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/targetSSLProxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
//
// To get more information about TargetSslProxy, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/targetSslProxies)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/targetSslProxies)
// * How-to Guides
// * [Setting Up SSL proxy for Google Cloud Load Balancing](https://cloud.google.com/compute/docs/load-balancing/tcp-ssl/)
//
Expand Down
2 changes: 1 addition & 1 deletion sdk/go/gcp/compute/targetTCPProxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
//
// To get more information about TargetTcpProxy, see:
//
// * [API documentation](https://cloud.google.com/compute/docs/reference/latest/targetTcpProxies)
// * [API documentation](https://cloud.google.com/compute/docs/reference/v1/targetTcpProxies)
// * How-to Guides
// * [Setting Up TCP proxy for Google Cloud Load Balancing](https://cloud.google.com/compute/docs/load-balancing/tcp-ssl/tcp-proxy)
//
Expand Down
Loading

0 comments on commit 3e07d81

Please sign in to comment.