rebase with upstream

GoogleCloudPlatform · Sep 9, 2022 · 53b4da5 · 53b4da5
1 parent fa11c9b
commit 53b4da5
Show file tree

Hide file tree

Showing 2 changed files with 200 additions and 149 deletions.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/terraformer
 
-go 1.18
+go 1.19
 
 require (
  cloud.google.com/go v0.100.2 // indirect
@@ -11,25 +11,25 @@ require (
  github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
  github.com/Azure/go-autorest/autorest v0.11.27
  github.com/DataDog/datadog-api-client-go v1.14.0
- github.com/IBM-Cloud/bluemix-go v0.0.0-20210203095940-db28d5e07b55
+ github.com/IBM-Cloud/bluemix-go v0.0.0-20220624043500-d538cb4fd9be
  github.com/IBM/go-sdk-core/v3 v3.3.1
  github.com/IBM/go-sdk-core/v4 v4.9.0
  github.com/IBM/ibm-cos-sdk-go v1.5.0
  github.com/IBM/keyprotect-go-client v0.6.0
  github.com/IBM/networking-go-sdk v0.30.0
- github.com/IBM/platform-services-go-sdk v0.19.1
+ github.com/IBM/platform-services-go-sdk v0.26.1
  github.com/IBM/vpc-go-sdk v0.4.1
  github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
  github.com/OctopusDeploy/go-octopusdeploy v1.6.0
- github.com/PaloAltoNetworks/pango v0.6.0
+ github.com/PaloAltoNetworks/pango v0.8.0
  github.com/SAP/go-hdb v0.105.2 // indirect
  github.com/SermoDigital/jose v0.9.1 // indirect
  github.com/aliyun/alibaba-cloud-sdk-go v1.61.1247
  github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible
  github.com/apache/openwhisk-client-go v0.0.0-20210106144548-17d556327cd3
- github.com/aws/aws-sdk-go-v2 v1.16.6
+ github.com/aws/aws-sdk-go-v2 v1.16.14
  github.com/aws/aws-sdk-go-v2/config v1.1.4
- github.com/aws/aws-sdk-go-v2/credentials v1.1.4
+ github.com/aws/aws-sdk-go-v2/credentials v1.12.14
  github.com/aws/aws-sdk-go-v2/service/accessanalyzer v1.2.0
  github.com/aws/aws-sdk-go-v2/service/acm v1.2.1
  github.com/aws/aws-sdk-go-v2/service/apigateway v1.2.1
@@ -40,7 +40,7 @@ require (
  github.com/aws/aws-sdk-go-v2/service/cloud9 v1.1.3
  github.com/aws/aws-sdk-go-v2/service/cloudformation v1.3.0
  github.com/aws/aws-sdk-go-v2/service/cloudfront v1.3.0
- github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.1.3
+ github.com/aws/aws-sdk-go-v2/service/cloudhsmv2 v1.13.8
  github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.2.1
  github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.18.2
  github.com/aws/aws-sdk-go-v2/service/cloudwatchevents v1.2.0
@@ -51,19 +51,19 @@ require (
  github.com/aws/aws-sdk-go-v2/service/codepipeline v1.13.3
  github.com/aws/aws-sdk-go-v2/service/cognitoidentity v1.2.1
  github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.2.1
- github.com/aws/aws-sdk-go-v2/service/configservice v1.3.0
+ github.com/aws/aws-sdk-go-v2/service/configservice v1.25.4
  github.com/aws/aws-sdk-go-v2/service/datapipeline v1.13.6
  github.com/aws/aws-sdk-go-v2/service/devicefarm v1.13.3
  github.com/aws/aws-sdk-go-v2/service/docdb v1.18.1
  github.com/aws/aws-sdk-go-v2/service/dynamodb v1.2.1
  github.com/aws/aws-sdk-go-v2/service/ec2 v1.3.0
- github.com/aws/aws-sdk-go-v2/service/ecr v1.17.6
- github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.2.0
+ github.com/aws/aws-sdk-go-v2/service/ecr v1.17.16
+ github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.8
  github.com/aws/aws-sdk-go-v2/service/ecs v1.2.1
  github.com/aws/aws-sdk-go-v2/service/efs v1.2.1
  github.com/aws/aws-sdk-go-v2/service/eks v1.2.1
  github.com/aws/aws-sdk-go-v2/service/elasticache v1.2.1
- github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.2.1
+ github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.14.9
  github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.2.1
  github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.2.1
  github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.15.4
@@ -74,8 +74,8 @@ require (
  github.com/aws/aws-sdk-go-v2/service/iot v1.24.1
  github.com/aws/aws-sdk-go-v2/service/kafka v1.14.0
  github.com/aws/aws-sdk-go-v2/service/kinesis v1.2.1
- github.com/aws/aws-sdk-go-v2/service/kms v1.2.2
- github.com/aws/aws-sdk-go-v2/service/lambda v1.2.1
+ github.com/aws/aws-sdk-go-v2/service/kms v1.18.1
+ github.com/aws/aws-sdk-go-v2/service/lambda v1.23.6
  github.com/aws/aws-sdk-go-v2/service/mediapackage v1.15.3
  github.com/aws/aws-sdk-go-v2/service/mediastore v1.12.5
  github.com/aws/aws-sdk-go-v2/service/opsworks v1.2.2
@@ -93,8 +93,8 @@ require (
  github.com/aws/aws-sdk-go-v2/service/sns v1.2.1
  github.com/aws/aws-sdk-go-v2/service/sqs v1.3.0
  github.com/aws/aws-sdk-go-v2/service/ssm v1.3.0
- github.com/aws/aws-sdk-go-v2/service/sts v1.2.1
- github.com/aws/aws-sdk-go-v2/service/swf v1.10.0
+ github.com/aws/aws-sdk-go-v2/service/sts v1.16.13
+ github.com/aws/aws-sdk-go-v2/service/swf v1.13.8
  github.com/aws/aws-sdk-go-v2/service/waf v1.1.4
  github.com/aws/aws-sdk-go-v2/service/wafregional v1.12.3
  github.com/aws/aws-sdk-go-v2/service/wafv2 v1.18.0
@@ -109,21 +109,21 @@ require (
  github.com/denisenkom/go-mssqldb v0.10.0 // indirect
  github.com/denverdino/aliyungo v0.0.0-20200327235253-d59c209c7e93
  github.com/dgrijalva/jwt-go v3.2.0+incompatible
- github.com/digitalocean/godo v1.57.0
+ github.com/digitalocean/godo v1.83.0
  github.com/docker/go-connections v0.4.0 // indirect
  github.com/duosecurity/duo_api_golang v0.0.0-20201112143038-0e07e9f869e3 // indirect
  github.com/elazarl/go-bindata-assetfs v1.0.1 // indirect
  github.com/fastly/go-fastly/v6 v6.3.2
  github.com/fatih/structs v1.1.0 // indirect
  github.com/gocql/gocql v0.0.0-20210707082121-9a3953d1826d // indirect
  github.com/google/go-github/v35 v35.1.0
- github.com/gophercloud/gophercloud v0.24.0
+ github.com/gophercloud/gophercloud v1.0.0
  github.com/grafana/grafana-api-golang-client v0.0.0-20210218192924-9ccd2365d2a6
  github.com/hashicorp/go-azure-helpers v0.36.0
  github.com/hashicorp/go-cleanhttp v0.5.2
- github.com/hashicorp/go-hclog v0.16.2
+ github.com/hashicorp/go-hclog v1.2.1
  github.com/hashicorp/go-memdb v1.3.2 // indirect
- github.com/hashicorp/go-plugin v1.4.1
+ github.com/hashicorp/go-plugin v1.4.4
  github.com/hashicorp/hcl v1.0.0
  github.com/hashicorp/terraform v0.12.31
  github.com/hashicorp/vault v0.10.4
@@ -139,7 +139,6 @@ require (
  github.com/microsoft/azure-devops-go-api/azuredevops v1.0.0-b5
  github.com/mrparkers/terraform-provider-keycloak v0.0.0-20200506151941-509881368409
  github.com/nicksnyder/go-i18n v1.10.1 // indirect
- github.com/ns1/ns1-go v2.4.0+incompatible
  github.com/okta/okta-sdk-golang/v2 v2.12.2-0.20220602195034-d7ea6917663f
  github.com/opencontainers/image-spec v1.0.1 // indirect
  github.com/opencontainers/runc v1.0.1 // indirect
@@ -156,13 +155,13 @@ require (
  github.com/xanzy/go-gitlab v0.50.2
  github.com/yandex-cloud/go-genproto v0.0.0-20220314102905-1acaee8ca7eb
  github.com/yandex-cloud/go-sdk v0.0.0-20220314105123-d0c2a928feb6
- github.com/zclconf/go-cty v1.8.4
+ github.com/zclconf/go-cty v1.10.0
  github.com/zorkian/go-datadog-api v2.30.0+incompatible
- golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401
+ golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
  golang.org/x/text v0.3.7
  gonum.org/v1/gonum v0.7.0
  google.golang.org/api v0.70.0
- google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106
+ google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3
  gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
  k8s.io/apimachinery v0.24.2
  k8s.io/client-go v0.24.2
@@ -198,27 +197,26 @@ require (
  github.com/Azure/go-autorest/logger v0.2.1 // indirect
  github.com/Azure/go-autorest/tracing v0.6.0 // indirect
  github.com/BurntSushi/toml v1.1.0 // indirect
- github.com/IBM/go-sdk-core/v5 v5.8.0 // indirect
+ github.com/IBM/go-sdk-core/v5 v5.10.1 // indirect
  github.com/Masterminds/goutils v1.1.0 // indirect
  github.com/Masterminds/semver v1.5.0 // indirect
  github.com/Masterminds/sprig v2.22.0+incompatible // indirect
- github.com/agext/levenshtein v1.2.2 // indirect
+ github.com/agext/levenshtein v1.2.3 // indirect
  github.com/apparentlymart/go-cidr v1.1.0 // indirect
- github.com/apparentlymart/go-textseg/v12 v12.0.0 // indirect
  github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
  github.com/appscode/go-querystring v0.0.0-20170504095604-0126cfb3f1dc // indirect
  github.com/armon/go-radix v1.0.0 // indirect
  github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
  github.com/aws/aws-sdk-go v1.37.0 // indirect
- github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.5 // indirect
- github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.13 // indirect
- github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.7 // indirect
+ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.12 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.21 // indirect
+ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.15 // indirect
  github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.3 // indirect
- github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.4 // indirect
+ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.12 // indirect
  github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.1 // indirect
  github.com/aws/aws-sdk-go-v2/service/redshift v1.10.0
- github.com/aws/aws-sdk-go-v2/service/sso v1.1.4 // indirect
- github.com/aws/smithy-go v1.12.0 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.11.17 // indirect
+ github.com/aws/smithy-go v1.13.2 // indirect
  github.com/beevik/etree v1.1.0 // indirect
  github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
  github.com/bgentry/speakeasy v0.1.0 // indirect
@@ -230,14 +228,14 @@ require (
  github.com/dghubble/sling v1.1.0 // indirect
  github.com/dimchansky/utfbom v1.1.1 // indirect
  github.com/docker/go-units v0.4.0 // indirect
- github.com/fatih/color v1.7.0 // indirect
+ github.com/fatih/color v1.13.0 // indirect
  github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
  github.com/ghodss/yaml v1.0.0 // indirect
  github.com/go-logr/logr v1.2.0 // indirect
  github.com/go-openapi/errors v0.19.8 // indirect
- github.com/go-openapi/strfmt v0.20.2 // indirect
- github.com/go-playground/locales v0.13.0 // indirect
- github.com/go-playground/universal-translator v0.17.0 // indirect
+ github.com/go-openapi/strfmt v0.21.2 // indirect
+ github.com/go-playground/locales v0.14.0 // indirect
+ github.com/go-playground/universal-translator v0.18.0 // indirect
  github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect
  github.com/go-routeros/routeros v0.0.0-20210123142807-2a44d57c6730 // indirect
  github.com/go-stack/stack v1.8.0 // indirect
@@ -249,46 +247,46 @@ require (
  github.com/google/go-querystring v1.1.0 // indirect
  github.com/google/gofuzz v1.1.0 // indirect
  github.com/google/jsonapi v1.0.0 // indirect
- github.com/google/uuid v1.2.0 // indirect
+ github.com/google/uuid v1.3.0 // indirect
  github.com/googleapis/gax-go/v2 v2.1.1 // indirect
  github.com/gorilla/websocket v1.4.2 // indirect
  github.com/hashicorp/errwrap v1.1.0 // indirect
  github.com/hashicorp/go-getter v1.5.3 // indirect
  github.com/hashicorp/go-multierror v1.1.1 // indirect
- github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
+ github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
  github.com/hashicorp/go-rootcerts v1.0.0 // indirect
  github.com/hashicorp/go-safetemp v1.0.0 // indirect
  github.com/hashicorp/go-sockaddr v1.0.0 // indirect
- github.com/hashicorp/go-uuid v1.0.2 // indirect
- github.com/hashicorp/go-version v1.3.0 // indirect
+ github.com/hashicorp/go-uuid v1.0.3 // indirect
+ github.com/hashicorp/go-version v1.6.0 // indirect
  github.com/hashicorp/golang-lru v0.5.4 // indirect
- github.com/hashicorp/hcl/v2 v2.8.2 // indirect
+ github.com/hashicorp/hcl/v2 v2.13.0 // indirect
  github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590 // indirect
- github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
+ github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
  github.com/huandu/xstrings v1.3.2 // indirect
  github.com/imdario/mergo v0.3.12 // indirect
  github.com/inconshreveable/mousetrap v1.0.0 // indirect
  github.com/jonboulle/clockwork v0.2.1 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/kelseyhightower/envconfig v1.4.0 // indirect
- github.com/klauspost/compress v1.11.2 // indirect
- github.com/leodido/go-urn v1.2.0 // indirect
+ github.com/klauspost/compress v1.13.6 // indirect
+ github.com/leodido/go-urn v1.2.1 // indirect
  github.com/mattermost/xml-roundtrip-validator v0.0.0-20201213122252-bcd7e1b9601e // indirect
  github.com/mattn/go-colorable v0.1.12 // indirect
  github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d // indirect
  github.com/mattn/go-isatty v0.0.14 // indirect
  github.com/mitchellh/cli v1.1.2 // indirect
  github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/go-homedir v1.1.0
- github.com/mitchellh/go-testing-interface v1.0.4 // indirect
+ github.com/mitchellh/go-testing-interface v1.14.1 // indirect
  github.com/mitchellh/go-wordwrap v1.0.0 // indirect
  github.com/mitchellh/hashstructure v1.0.0 // indirect
- github.com/mitchellh/mapstructure v1.4.3 // indirect
+ github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/mozillazg/go-httpheader v0.2.1 // indirect
- github.com/oklog/run v1.0.0 // indirect
+ github.com/oklog/run v1.1.0 // indirect
  github.com/oklog/ulid v1.3.1 // indirect
  github.com/opencontainers/go-digest v1.0.0 // indirect
  github.com/patrickmn/go-cache v0.0.0-20180815053127-5633e0862627 // indirect
@@ -302,29 +300,29 @@ require (
  github.com/sirupsen/logrus v1.8.1 // indirect
  github.com/sourcegraph/jsonrpc2 v0.0.0-20210201082850-366fbb520750 // indirect
  github.com/spf13/afero v1.2.2 // indirect
- github.com/stretchr/testify v1.7.1 // indirect
+ github.com/stretchr/testify v1.8.0 // indirect
  github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
  github.com/ulikunitz/xz v0.5.8 // indirect
  github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
- github.com/vmihailenco/tagparser v0.1.1 // indirect
+ github.com/vmihailenco/tagparser v0.1.2 // indirect
  github.com/xdg-go/pbkdf2 v1.0.0 // indirect
  github.com/xdg-go/scram v1.0.2 // indirect
  github.com/xdg-go/stringprep v1.0.2 // indirect
  github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
- go.mongodb.org/mongo-driver v1.7.2 // indirect
+ go.mongodb.org/mongo-driver v1.7.5 // indirect
  go.opencensus.io v0.23.0 // indirect
  golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
  golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
- golang.org/x/net v0.0.0-20220526153639-5463443f8c37 // indirect
+ golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
  golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
  golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
  golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
- golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+ golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
  golang.org/x/tools v0.1.8 // indirect
  golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/grpc v1.45.0 // indirect
- google.golang.org/protobuf v1.28.0 // indirect
+ google.golang.org/grpc v1.48.0 // indirect
+ google.golang.org/protobuf v1.28.1 // indirect
  gopkg.in/auth0.v5 v5.21.1
  gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
  gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
@@ -333,7 +331,7 @@ require (
  gopkg.in/ini.v1 v1.62.0 // indirect
  gopkg.in/square/go-jose.v2 v2.6.0 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
- gopkg.in/yaml.v3 v3.0.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
  k8s.io/api v0.24.2 // indirect
  k8s.io/klog/v2 v2.60.1 // indirect
  k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
@@ -344,11 +342,13 @@ require (
 require github.com/PuerkitoBio/rehttp v1.0.0 // indirect
 
 require (
+ cloud.google.com/go/cloudbuild v1.2.0
  cloud.google.com/go/cloudtasks v1.3.0
  cloud.google.com/go/iam v0.3.0
  cloud.google.com/go/monitoring v1.4.0
- github.com/authlete/openapi-for-go v1.0.0
+ github.com/authlete/openapi-for-go v1.1.0
  github.com/manicminer/hamilton v0.44.0
+ github.com/ns1/ns1-go v2.4.0+incompatible
 )
 
 require (
@@ -362,6 +362,7 @@ require (
  github.com/go-openapi/swag v0.19.14 // indirect
  github.com/golang-jwt/jwt/v4 v4.3.0 // indirect
  github.com/google/gnostic v0.5.7-v3refs // indirect
+ github.com/joho/godotenv v1.4.0 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/mailru/easyjson v0.7.6 // indirect
  github.com/manicminer/hamilton-autorest v0.2.0 // indirect
@@ -371,3 +372,5 @@ require (
 )
 
 replace gopkg.in/jarcoal/httpmock.v1 => github.com/jarcoal/httpmock v1.0.5
+
+replace gopkg.in/ns1/ns1-go.v2 => github.com/ns1/ns1-go/v2 v2.6.5