Skip to content

Commit

Permalink
Merge pull request #3140 from abhinavdahiya/bump_tf_aws
Browse files Browse the repository at this point in the history
bug 1766691: go.mod: bump terraform-provider-aws to v2.49.0
  • Loading branch information
openshift-merge-robot committed Feb 21, 2020
2 parents 9220dbd + 51784a3 commit e440bba
Show file tree
Hide file tree
Showing 103 changed files with 16,304 additions and 1,488 deletions.
12 changes: 5 additions & 7 deletions go.mod
Expand Up @@ -18,7 +18,7 @@ require (
github.com/antchfx/xpath v1.1.2 // indirect
github.com/apparentlymart/go-cidr v1.0.1
github.com/awalterschulze/gographviz v0.0.0-20190522210029-fa59802746ab
github.com/aws/aws-sdk-go v1.28.8
github.com/aws/aws-sdk-go v1.28.9
github.com/btubbs/datetime v0.1.1 // indirect
github.com/c4milo/gotoolkit v0.0.0-20190525173301-67483a18c17a // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
Expand Down Expand Up @@ -47,12 +47,11 @@ require (
github.com/hashicorp/memberlist v0.1.5 // indirect
github.com/hashicorp/serf v0.8.5 // indirect
github.com/hashicorp/terraform v0.0.0
github.com/hashicorp/terraform-plugin-sdk v1.5.0
github.com/hashicorp/terraform-plugin-sdk v1.6.0
github.com/hashicorp/vault v1.3.0 // indirect
github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c // indirect
github.com/joyent/triton-go v1.7.0 // indirect
github.com/keybase/go-crypto v0.0.0-20190828182435-a05457805304 // indirect
github.com/kubernetes-sigs/aws-iam-authenticator v0.4.0 // indirect
github.com/libvirt/libvirt-go v5.10.0+incompatible
github.com/libvirt/libvirt-go-xml v5.10.0+incompatible // indirect
github.com/lusis/go-artifactory v0.0.0-20180304164534-a47f63f234b2 // indirect
Expand Down Expand Up @@ -90,7 +89,7 @@ require (
github.com/spf13/cobra v0.0.5
github.com/stoewer/go-strcase v1.1.0 // indirect
github.com/stretchr/testify v1.4.0
github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200130210954-e03ec66d8774
github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20200214022145-f0f304894df6
github.com/terraform-providers/terraform-provider-azuread v0.7.0 // indirect
github.com/terraform-providers/terraform-provider-azurerm v0.0.0
github.com/terraform-providers/terraform-provider-google v1.20.1-0.20200204003432-77547e3e7d52
Expand All @@ -113,7 +112,7 @@ require (
google.golang.org/api v0.14.0
gopkg.in/AlecAivazis/survey.v1 v1.8.8
gopkg.in/ini.v1 v1.51.0
gopkg.in/yaml.v2 v2.2.7
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.17.2
k8s.io/apimachinery v0.17.2
k8s.io/client-go v12.0.0+incompatible
Expand All @@ -130,12 +129,11 @@ replace (
github.com/hashicorp/consul => github.com/hashicorp/consul v1.6.2 // Pin to version required by terraform fork
github.com/hashicorp/terraform => github.com/openshift/hashicorp-terraform v0.12.20-openshift // Pin to fork with deduplicated rpc types
github.com/hashicorp/terraform-plugin-sdk => github.com/openshift/hashicorp-terraform-plugin-sdk v1.6.0-openshift // Pin to fork with public rpc types
github.com/kubernetes-sigs/aws-iam-authenticator => github.com/kubernetes-sigs/aws-iam-authenticator v0.3.1-0.20181019024009-82544ec86140 // Pin to version required by tf-provider-aws
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20200206190020-71b826cc0f0a // Use OpenShift fork
github.com/metal3-io/cluster-api-provider-baremetal => github.com/openshift/cluster-api-provider-baremetal v0.0.0-20190821174549-a2a477909c1d // Pin OpenShift fork
github.com/openshift/api => github.com/openshift/api v0.0.0-20200210091934-a0e53e94816b // Pin API
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20200130220348-e5685c0cf530 // Pin MCO so it doesn't get downgraded
github.com/terraform-providers/terraform-provider-azurerm => github.com/openshift/terraform-provider-azurerm v1.41.1-openshift // Pin to openshift fork with IPv6 fixes
github.com/terraform-providers/terraform-provider-azurerm => github.com/openshift/terraform-provider-azurerm v1.41.1-openshift-2 // Pin to openshift fork with IPv6 fixes
github.com/terraform-providers/terraform-provider-vsphere => github.com/LorbusChris/terraform-provider-vsphere v1.14.1-0.20200128145507-331c3c135db7 // Pin to fork that has migrated to tf-plugin-sdk
google.golang.org/api => google.golang.org/api v0.13.0 // Pin to version required by tf-provider-google
k8s.io/api => k8s.io/api v0.17.1 // Replaced by MCO/CRI-O
Expand Down
80 changes: 70 additions & 10 deletions go.sum

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go

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

2 changes: 1 addition & 1 deletion vendor/github.com/aws/aws-sdk-go/aws/version.go

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

0 comments on commit e440bba

Please sign in to comment.