Merge pull request #5076 from patrickdillon/verify-vendor-tidy

verify-vendor: add go mod tidy
openshift · Jul 15, 2021 · 252facf · 252facf
2 parents cd9b77b + 1022e0d
commit 252facf
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 224 deletions.
diff --git a/go.mod b/go.mod
@@ -14,8 +14,6 @@ require (
 	github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d // indirect
 	github.com/IBM-Cloud/bluemix-go v0.0.0-20210611051827-cdc80c935c05
 	github.com/IBM-Cloud/terraform-provider-ibm v1.26.2
-	github.com/IBM/go-sdk-core v1.1.0 // indirect
-	github.com/IBM/go-sdk-core/v4 v4.10.0 // indirect
 	github.com/IBM/go-sdk-core/v5 v5.4.3
 	github.com/IBM/networking-go-sdk v0.14.0
 	github.com/IBM/platform-services-go-sdk v0.18.13
@@ -123,7 +121,7 @@ require (
 
 replace (
 	cloud.google.com/go => cloud.google.com/go v0.57.0
-	github.com/IBM-Cloud/terraform-provider-ibm => github.com/openshift/terraform-provider-ibm v1.26.2-openshift
+	github.com/IBM-Cloud/terraform-provider-ibm => github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2
 	github.com/go-log/log => github.com/go-log/log v0.1.1-0.20181211034820-a514cf01a3eb // Pinned by MCO
 	github.com/hashicorp/terraform => github.com/openshift/terraform v0.12.20-openshift-4 // Pin to fork with deduplicated rpc types v0.12.20-openshift-4
 	github.com/hashicorp/terraform-plugin-sdk => github.com/openshift/hashicorp-terraform-plugin-sdk v1.14.0-openshift // Pin to fork with public rpc types

diff --git a/go.sum b/go.sum
diff --git a/hack/verify-vendor.sh b/hack/verify-vendor.sh
@@ -2,6 +2,7 @@
 
 if [ "$IS_CONTAINER" != "" ]; then
   set -euxo pipefail
+  go mod tidy
   go mod vendor
   go mod verify
   git diff --exit-code

diff --git a/vendor/github.com/IBM-Cloud/terraform-provider-ibm/ibm/config.go b/vendor/github.com/IBM-Cloud/terraform-provider-ibm/ibm/config.go
diff --git a/vendor/github.com/IBM-Cloud/terraform-provider-ibm/ibm/data_source_ibm_api_gateway.go b/vendor/github.com/IBM-Cloud/terraform-provider-ibm/ibm/data_source_ibm_api_gateway.go
diff --git a/vendor/github.com/IBM-Cloud/terraform-provider-ibm/ibm/resource_ibm_api_gateway_endpoint.go b/vendor/github.com/IBM-Cloud/terraform-provider-ibm/ibm/resource_ibm_api_gateway_endpoint.go
diff --git a/...om/IBM-Cloud/terraform-provider-ibm/ibm/resource_ibm_api_gateway_endpoint_subscription.go b/...om/IBM-Cloud/terraform-provider-ibm/ibm/resource_ibm_api_gateway_endpoint_subscription.go
diff --git a/vendor/github.com/IBM/apigateway-go-sdk/README.md b/vendor/github.com/IBM/apigateway-go-sdk/README.md
diff --git a/...y-go-sdk/api_gateway_controller_api_v1.go → ...lerapiv1/api_gateway_controller_api_v1.go b/...y-go-sdk/api_gateway_controller_api_v1.go → ...lerapiv1/api_gateway_controller_api_v1.go
diff --git a/vendor/github.com/IBM/apigateway-go-sdk/go.mod b/vendor/github.com/IBM/apigateway-go-sdk/go.mod
diff --git a/vendor/github.com/IBM/apigateway-go-sdk/go.sum b/vendor/github.com/IBM/apigateway-go-sdk/go.sum
diff --git a/vendor/github.com/hashicorp/hil/.travis.yml b/vendor/github.com/hashicorp/hil/.travis.yml
diff --git a/vendor/github.com/hashicorp/hil/README.md b/vendor/github.com/hashicorp/hil/README.md
diff --git a/vendor/github.com/hashicorp/hil/appveyor.yml b/vendor/github.com/hashicorp/hil/appveyor.yml
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -254,14 +254,14 @@ github.com/IBM-Cloud/power-go-client/power/client/storage_types
 github.com/IBM-Cloud/power-go-client/power/client/swagger_spec
 github.com/IBM-Cloud/power-go-client/power/models
 github.com/IBM-Cloud/power-go-client/utils
-# github.com/IBM-Cloud/terraform-provider-ibm v1.26.2 => github.com/openshift/terraform-provider-ibm v1.26.2-openshift
+# github.com/IBM-Cloud/terraform-provider-ibm v1.26.2 => github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2
 ## explicit
 github.com/IBM-Cloud/terraform-provider-ibm/ibm
 github.com/IBM-Cloud/terraform-provider-ibm/ibm/internal/hashcode
 github.com/IBM-Cloud/terraform-provider-ibm/ibm/internal/mutexkv
 github.com/IBM-Cloud/terraform-provider-ibm/version
-# github.com/IBM/apigateway-go-sdk v0.0.0-20200414212859-416e5948678a
-github.com/IBM/apigateway-go-sdk
+# github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca
+github.com/IBM/apigateway-go-sdk/apigatewaycontrollerapiv1
 github.com/IBM/apigateway-go-sdk/common
 # github.com/IBM/appconfiguration-go-admin-sdk v0.1.0
 github.com/IBM/appconfiguration-go-admin-sdk/appconfigurationv1
@@ -270,12 +270,10 @@ github.com/IBM/appconfiguration-go-admin-sdk/common
 github.com/IBM/container-registry-go-sdk/common
 github.com/IBM/container-registry-go-sdk/containerregistryv1
 # github.com/IBM/go-sdk-core v1.1.0
-## explicit
 github.com/IBM/go-sdk-core/core
 # github.com/IBM/go-sdk-core/v3 v3.3.1
 github.com/IBM/go-sdk-core/v3/core
 # github.com/IBM/go-sdk-core/v4 v4.10.0
-## explicit
 github.com/IBM/go-sdk-core/v4/core
 # github.com/IBM/go-sdk-core/v5 v5.4.3
 ## explicit
@@ -1029,7 +1027,7 @@ github.com/hashicorp/hcl/v2/hclparse
 github.com/hashicorp/hcl/v2/hclsyntax
 github.com/hashicorp/hcl/v2/hclwrite
 github.com/hashicorp/hcl/v2/json
-# github.com/hashicorp/hil v0.0.0-20200423225030-a18a1cd20038
+# github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93
 github.com/hashicorp/hil
 github.com/hashicorp/hil/ast
 github.com/hashicorp/hil/parser
@@ -2908,7 +2906,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.2.0
 sigs.k8s.io/yaml
 # cloud.google.com/go => cloud.google.com/go v0.57.0
-# github.com/IBM-Cloud/terraform-provider-ibm => github.com/openshift/terraform-provider-ibm v1.26.2-openshift
+# github.com/IBM-Cloud/terraform-provider-ibm => github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2
 # github.com/go-log/log => github.com/go-log/log v0.1.1-0.20181211034820-a514cf01a3eb
 # github.com/hashicorp/terraform => github.com/openshift/terraform v0.12.20-openshift-4
 # github.com/hashicorp/terraform-plugin-sdk => github.com/openshift/hashicorp-terraform-plugin-sdk v1.14.0-openshift